Skip to content
Snippets Groups Projects
Unverified Commit 5086ca2f authored by Łukasz Łopatowski's avatar Łukasz Łopatowski Committed by GitHub
Browse files

Merge pull request #54 from...

Merge pull request #54 from nmaas-platform/52-fix-users-view-when-user-has-both-system-admin-and-domain-admin-role

52 fix users view when user has both system admin and domain admin role
parents e6aa0cb4 5de65a80
No related branches found
No related tags found
No related merge requests found
<div class="col-sm-12" *roles="['ROLE_SYSTEM_ADMIN']"> <div class="col-sm-12" *ngIf="!domainMode" >
<nmaas-userslist *ngIf="!isInAddToDomainMode" [users]="allUsers" [allowedModes]="[ComponentMode.VIEW, ComponentMode.DELETE]" (onUserRoleChange)="onUserRoleChange($event)" <div *roles="['ROLE_SYSTEM_ADMIN']" >
(onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onDelete)="onUserDelete($event)" (onRemoveFromDomain)="onRemoveRole($event)"> <nmaas-userslist *ngIf="!isInAddToDomainMode" [users]="allUsers" [allowedModes]="[ComponentMode.VIEW, ComponentMode.DELETE]" (onUserRoleChange)="onUserRoleChange($event)"
</nmaas-userslist> (onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onDelete)="onUserDelete($event)" (onRemoveFromDomain)="onRemoveRole($event)">
<nmaas-userslist *ngIf="isInAddToDomainMode" [users]="usersToAdd" [allowedModes]="[ComponentMode.VIEW, ComponentMode.EDIT]" (onUserRoleChange)="onUserRoleChange($event)" </nmaas-userslist>
(onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onAddToDomain)="onUserAddToDomain($event)"> <nmaas-userslist *ngIf="isInAddToDomainMode" [users]="usersToAdd" [allowedModes]="[ComponentMode.VIEW, ComponentMode.EDIT]" (onUserRoleChange)="onUserRoleChange($event)"
</nmaas-userslist> (onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onAddToDomain)="onUserAddToDomain($event)">
</nmaas-userslist>
</div>
</div> </div>
<div class="col-sm-12" *roles="['ROLE_DOMAIN_ADMIN']"> <div class="col-sm-12" *ngIf="domainMode" >
<nmaas-userslist *ngIf="!isInAddToDomainMode" [users]="allUsers" [allowedModes]="[ComponentMode.VIEW, ComponentMode.DELETE]" [domainMode]="true" (onUserRoleChange)="onUserRoleChange($event)" <div *roles="['ROLE_DOMAIN_ADMIN']">
(onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onDelete)="onUserDelete($event)" (onRemoveFromDomain)="onRemoveRole($event)"> <nmaas-userslist *ngIf="!isInAddToDomainMode" [users]="allUsers" [allowedModes]="[ComponentMode.VIEW, ComponentMode.DELETE]" [domainMode]="true" (onUserRoleChange)="onUserRoleChange($event)"
</nmaas-userslist> (onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onDelete)="onUserDelete($event)" (onRemoveFromDomain)="onRemoveRole($event)">
<nmaas-userslist *ngIf="isInAddToDomainMode" [users]="usersToAdd" [allowedModes]="[ComponentMode.VIEW, ComponentMode.EDIT]" [domainMode]="true" </nmaas-userslist>
(onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onAddToDomain)="onUserAddToDomain($event)" (onUserRoleChange)="onUserRoleChange($event)"> <nmaas-userslist *ngIf="isInAddToDomainMode" [users]="usersToAdd" [allowedModes]="[ComponentMode.VIEW, ComponentMode.EDIT]" [domainMode]="true"
</nmaas-userslist> (onView)="onUserView($event)" (onModeChange)="onModeChange($event)" (onAddToDomain)="onUserAddToDomain($event)" (onUserRoleChange)="onUserRoleChange($event)">
</nmaas-userslist>
</div>
</div> </div>
...@@ -6,7 +6,7 @@ import {UserService} from '../../../service/user.service'; ...@@ -6,7 +6,7 @@ import {UserService} from '../../../service/user.service';
import {UserDataService} from '../../../service/userdata.service'; import {UserDataService} from '../../../service/userdata.service';
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {ComponentMode} from '../../../shared/common/componentmode'; import {ComponentMode} from '../../../shared/common/componentmode';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
import {Location} from '@angular/common'; import {Location} from '@angular/common';
import {Observable, of} from 'rxjs'; import {Observable, of} from 'rxjs';
import {map} from 'rxjs/operators'; import {map} from 'rxjs/operators';
...@@ -20,13 +20,15 @@ export class UsersListComponent implements OnInit { ...@@ -20,13 +20,15 @@ export class UsersListComponent implements OnInit {
public ComponentMode = ComponentMode; public ComponentMode = ComponentMode;
private domainId: number; public domainId: number;
public allUsers: User[] = []; public allUsers: User[] = [];
public usersToAdd: User[] = []; public usersToAdd: User[] = [];
public isInAddToDomainMode = false; public isInAddToDomainMode = false;
public domainMode = false;
constructor(protected authService: AuthService, constructor(protected authService: AuthService,
protected userService: UserService, protected userService: UserService,
protected domainService: DomainService, protected domainService: DomainService,
...@@ -39,6 +41,13 @@ export class UsersListComponent implements OnInit { ...@@ -39,6 +41,13 @@ export class UsersListComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.userDataService.selectedDomainId.subscribe((domainId) => this.update(domainId)); this.userDataService.selectedDomainId.subscribe((domainId) => this.update(domainId));
this.router.events.subscribe(event => {
if (event instanceof NavigationEnd) {
if (event.url.includes('domain')) {
this.domainMode = true;
}
}
})
} }
public update(domainId: number): void { public update(domainId: number): void {
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
[routerLink]="['/admin/users']">{{ 'NAVBAR.USERS' | translate }}</a> [routerLink]="['/admin/users']">{{ 'NAVBAR.USERS' | translate }}</a>
</li> </li>
<li *roles="['ROLE_DOMAIN_ADMIN']"><a <li *roles="['ROLE_DOMAIN_ADMIN']"><a
[routerLink]="['/domain/users']">{{ 'NAVBAR.USERS' | translate }}</a> [routerLink]="['/domain/users']">{{ 'NAVBAR.DOMAIN_USERS' | translate }}</a>
</li> </li>
<li *roles="['ROLE_SYSTEM_ADMIN', 'ROLE_TOOL_MANAGER']"><a <li *roles="['ROLE_SYSTEM_ADMIN', 'ROLE_TOOL_MANAGER']"><a
[routerLink]="['/admin/apps']">{{ 'NAVBAR.MARKET' | translate }}</a> [routerLink]="['/admin/apps']">{{ 'NAVBAR.MARKET' | translate }}</a>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment