Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(admin): Show and set system admin #16

Merged
merged 3 commits into from
Jun 6, 2019
Merged

feat(admin): Show and set system admin #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e8f6e6
feat(admin): Show if a user is sys admin
kilchenmann Jun 3, 2019
90f9b31
feat(admin): Update sys admin
kilchenmann Jun 3, 2019
f0e2eae
chore(admin): Remove console.log
kilchenmann Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/app/system/users/users-list/users-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ <h5 class="mat-subheading-2">
<mat-chip-list *ngIf="projectcode">
<mat-chip *ngIf="userIsProjectAdmin(user.permissions)">Admin</mat-chip>
</mat-chip-list>
<mat-chip-list *ngIf="!projectcode && userIsSystemAdmin(user.permissions)">
<mat-chip>System Admin</mat-chip>
</mat-chip-list>
</td>

<!-- group: only in project view -->
Expand All @@ -67,11 +70,18 @@ <h5 class="mat-subheading-2">
<mat-menu #projectUserMenu="matMenu" xPosition="before" class="menu">
<!-- update user's admin group membership; only in project view -->
<button mat-menu-item *ngIf="projectcode && user.status"
(click)="updateAdminMembership(user.id, user.permissions)">
(click)="updateProjectAdminMembership(user.id, user.permissions)">
<span *ngIf="!userIsProjectAdmin(user.permissions)">Add</span>
<span *ngIf="userIsProjectAdmin(user.permissions)">Remove</span>
<span>&nbsp;as project admin</span>
</button>
<!-- update user's system admin group membership; only in system admin view -->
<button mat-menu-item *ngIf="!projectcode && user.status && sysAdmin"
(click)="updateSystemAdminMembership(user.id, user.permissions)">
<span *ngIf="!userIsSystemAdmin(user.permissions)">Add</span>
<span *ngIf="userIsSystemAdmin(user.permissions)">Remove</span>
<span>&nbsp;as system admin</span>
</button>
<!-- update user's profile data; only for system admin -->
<button mat-menu-item *ngIf="sysAdmin && user.status"
(click)="openDialog('editUser', user.username)">
Expand All @@ -87,7 +97,7 @@ <h5 class="mat-subheading-2">
Remove user from project
</button>
<!-- add user to project; only in system view -->
<button mat-menu-item *ngIf="sysAdmin && !projectcode"
<button mat-menu-item *ngIf="user.status && sysAdmin && !projectcode"
(click)="openDialog('addUserToProject', user.username)">
Add user to project
</button>
Expand Down
93 changes: 65 additions & 28 deletions src/app/system/users/users-list/users-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,25 @@ export class UsersListComponent implements OnInit {
}
}

/**
* returns true, when the user is system admin
*
* @param permissions PermissionData from user profile
*/
userIsSystemAdmin(permissions: PermissionData): boolean {

let admin: boolean = false;
const groupsPerProjectKeys: string[] = Object.keys(permissions.groupsPerProject);

for (const key of groupsPerProjectKeys) {
if (key === KnoraConstants.SystemProjectIRI) {
admin = permissions.groupsPerProject[key].indexOf(KnoraConstants.SystemAdminGroupIRI) > -1;
}
}

return admin;
}

/**
* update user's group memebership
*/
Expand Down Expand Up @@ -230,7 +249,7 @@ export class UsersListComponent implements OnInit {
/**
* update user's admin-group membership
*/
updateAdminMembership(id: string, permissions: PermissionData): void {
updateProjectAdminMembership(id: string, permissions: PermissionData): void {
if (this.userIsProjectAdmin(permissions)) {
// true = user is already project admin --> remove from admin rights
this._usersService
Expand Down Expand Up @@ -275,6 +294,39 @@ export class UsersListComponent implements OnInit {
}
}

updateSystemAdminMembership(id: string, permissions: PermissionData): void {
if (this.userIsSystemAdmin(permissions)) {
// true = user is already system admin --> remove from system admin rights
this._usersService
.removeUserFromSystemAdmin(id)
.subscribe(
(result: User) => {
// console.log(result);
// if this user is not the logged-in user
if (this.session.user.name !== result.username) {
this.refreshParent.emit();
}
},
(error: ApiServiceError) => {
console.error(error);
}
);
} else {
// false: user isn't system admin yet --> add system admin rights
this._usersService
.addUserToSystemAdmin(id)
.subscribe(
(result: User) => {
// console.log(result);
this.refreshParent.emit();
},
(error: ApiServiceError) => {
console.error(error);
}
);
}
}

/**
* open dialog in every case of modification:
* edit user profile data, update user's password,
Expand Down Expand Up @@ -321,7 +373,7 @@ export class UsersListComponent implements OnInit {
/**
* remove user from project and update list of users
*
* @param {string} id user's IRI
* @param id user's IRI
* @returns void
*/
removeUserFromProject(id: string): void {
Expand All @@ -336,6 +388,12 @@ export class UsersListComponent implements OnInit {
);
}


/**
* delete resp. deactivate user
*
* @param id user's IRI
*/
deleteUser(id: string) {
this._usersService.deleteUser(id).subscribe(
(result: User) => {
Expand All @@ -348,6 +406,11 @@ export class UsersListComponent implements OnInit {
);
}

/**
* Reactivate user
*
* @param id user's IRI
*/
activateUser(id: string) {
this._usersService.activateUser(id).subscribe(
(result: User) => {
Expand All @@ -359,30 +422,4 @@ export class UsersListComponent implements OnInit {
}
);
}


/**
* returns true, when the user is system admin
* TODO: it's not working as long the knora admin api
* returns empty objects in the list of users
*
* @param {User} user User object
* @returns boolean
*/
systemAdmin(user: User): boolean {

let admin: boolean = false;

const groupsPerProjectKeys: string[] = Object.keys(user.permissions.groupsPerProject);

for (const key of groupsPerProjectKeys) {
if (key === KnoraConstants.SystemProjectIRI) {
admin = user.permissions.groupsPerProject[key].indexOf(KnoraConstants.SystemAdminGroupIRI) > -1;
}
}

return admin;

}

}
14 changes: 13 additions & 1 deletion src/app/system/users/users.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class UsersComponent implements OnInit {
// list of inactive (deleted) users
inactive: User[] = [];

constructor(
constructor (
private _usersService: UsersService,
private _route: ActivatedRoute,
private _titleService: Title
Expand All @@ -40,6 +40,18 @@ export class UsersComponent implements OnInit {
this.inactive = [];

for (const u of result) {
// get permission for each user
// by default, permission is not shown in the
// api result of user's list
this._usersService.getUserByIri(u.id).subscribe(
(res: User) => {
u.permissions = res.permissions;
},
(error: ApiServiceError) => {
console.error(error);
}
);

if (u.status === true) {
this.active.push(u);
} else {
Expand Down