Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding user edit component

This commit is contained in:
Martin Stockhammer 2020-11-11 23:02:43 +01:00
parent 34697b1a55
commit dd422882ca
7 changed files with 124 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/app-routing.module.ts
View File

@ -49,6 +49,7 @@ const routes: Routes = [
{path: 'list', component: ManageUsersListComponent}, {path: 'list', component: ManageUsersListComponent},
{path: 'add', component: ManageUsersAddComponent}, {path: 'add', component: ManageUsersAddComponent},
{path: 'edit/:userid', component: ManageUsersEditComponent}, {path: 'edit/:userid', component: ManageUsersEditComponent},
{path: 'edit', redirectTo:'edit/guest' },
{path: '', redirectTo:'list', pathMatch:'full'} {path: '', redirectTo:'list', pathMatch:'full'}
] ]
}, },

2
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/manage-users/manage-users.component.html
View File

@ -25,7 +25,7 @@
<a class="nav-link" routerLink="/user/users/add" routerLinkActive="active" href="#">{{'users.add.head' |translate }}</a> <a class="nav-link" routerLink="/user/users/add" routerLinkActive="active" href="#">{{'users.add.head' |translate }}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" routerLink="/user/users/edit/guest" routerLinkActive="active" href="#">{{'users.edit.head' |translate }}</a> <a class="nav-link" routerLink="/user/users/edit" routerLinkActive="active" href="#">{{'users.edit.head' |translate }}</a>
</li> </li>
</ul> </ul>

13
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/users/manage-users-add/manage-users-add.component.ts
View File

@ -26,6 +26,7 @@ import {HttpErrorResponse} from "@angular/common/http";
import {ErrorResult} from "../../../../model/error-result"; import {ErrorResult} from "../../../../model/error-result";
import {catchError} from "rxjs/operators"; import {catchError} from "rxjs/operators";
import {of, throwError} from 'rxjs'; import {of, throwError} from 'rxjs';
import {environment} from "../../../../../environments/environment";
@Component({ @Component({
selector: 'app-manage-users-add', selector: 'app-manage-users-add',
@ -34,7 +35,7 @@ import {of, throwError} from 'rxjs';
}) })
export class ManageUsersAddComponent implements OnInit { export class ManageUsersAddComponent implements OnInit {
minUserIdSize=8; minUserIdSize=environment.application.minUserIdLength;
success:boolean=false; success:boolean=false;
error:boolean=false; error:boolean=false;
errorResult:ErrorResult; errorResult:ErrorResult;
@ -53,7 +54,7 @@ export class ManageUsersAddComponent implements OnInit {
validator: MustMatch('password', 'confirm_password') validator: MustMatch('password', 'confirm_password')
}) })
constructor(private userService: UserService, private fb: FormBuilder) { constructor(public userService: UserService, public fb: FormBuilder) {
} }
@ -97,16 +98,16 @@ export class ManageUsersAddComponent implements OnInit {
} }
valid(field:string) : string { valid(field:string) : string[] {
let formField = this.userForm.get(field); let formField = this.userForm.get(field);
if (formField.dirty||formField.touched) { if (formField.dirty||formField.touched) {
if (formField.valid) { if (formField.valid) {
return 'is-valid' return ['is-valid']
} else { } else {
return 'is-invalid' return ['is-invalid']
} }
} else { } else {
return '' return ['']
} }
} }

73
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/users/manage-users-edit/manage-users-edit.component.html
View File

@ -17,56 +17,75 @@
--> -->
<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()"> <form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
<div class="form-group col-md-8"> <div class="form-group row col-md-8">
<label for="user_id">{{'users.attributes.user_id' |translate}}</label> <div class="col-md-1">Edit <span class="fas fa-edit"></span></div>
<input type="text" class="form-control" formControlName="user_id" id="user_id" <div class="col-md-6">
<input class="form-check-input" type="checkbox" [value]="editMode"
(change)="editMode=!editMode"
>
</div>
</div>
<div class="form-group row col-md-8">
<label class="col-md-2 col-form-label" for="user_id">{{'users.attributes.user_id' |translate}}</label>
<div class="col-md-6" >
<input type="text" formControlName="user_id" id="user_id"
[ngClass]="valid('user_id')" [ngClass]="valid('user_id')"
placeholder="{{'users.input.user_id'|translate}}"> value="{{editUser.user_id}}" [attr.readonly]="!editMode">
<small>{{'users.input.small.user_id'|translate:{'minSize':this.minUserIdSize} }}</small> <small *ngIf="editMode">{{'users.input.small.user_id'|translate:{'minSize':this.minUserIdSize} }}</small>
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group row col-md-8">
<label for="full_name">{{'users.attributes.full_name' |translate}}</label> <label class="col-md-2 col-form-label" for="full_name">{{'users.attributes.full_name' |translate}}</label>
<input type="text" class="form-control" formControlName="full_name" id="full_name" <div class="col-md-6" >
[ngClass]="valid('full_name')" <input type="text" formControlName="full_name" id="full_name"
placeholder="{{'users.input.full_name'|translate}}"> [ngClass]="valid('full_name')" value="{{editUser.full_name}}" [attr.readonly]="!editMode" >
<small>{{'users.input.small.full_name'|translate}}</small> <small *ngIf="editMode">{{'users.input.small.full_name'|translate}}</small>
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group row col-md-8">
<label for="email">{{'users.attributes.email' |translate}}</label> <label class="col-md-2 col-form-label" for="email">{{'users.attributes.email' |translate}}</label>
<input type="text" class="form-control" formControlName="email" id="email" <div class="col-md-6" >
[ngClass]="valid('email')" <input type="text" formControlName="email" id="email"
placeholder="{{'users.input.email'|translate}}"> [ngClass]="valid('email')" value="{{editUser.email}}" [attr.readonly]="!editMode">
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group row col-md-8" *ngIf="editMode">
<label for="password">{{'users.attributes.password' |translate}}</label> <label class="col-md-2 col-form-label" for="password">{{'users.attributes.password' |translate}}</label>
<div class="col-md-6" >
<input type="password" class="form-control" formControlName="password" id="password" <input type="password" class="form-control" formControlName="password" id="password"
[ngClass]="valid('password')" [ngClass]="valid('password')"
placeholder="{{'users.input.password'|translate}}"> placeholder="{{'users.input.password'|translate}}">
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group row col-md-8" *ngIf="editMode">
<label for="confirm_password">{{'users.attributes.confirm_password' |translate}}</label> <label class="col-md-2 col-form-label" for="confirm_password">{{'users.attributes.confirm_password' |translate}}</label>
<div class="col-md-6">
<input type="password" class="form-control" formControlName="confirm_password" id="confirm_password" <input type="password" class="form-control" formControlName="confirm_password" id="confirm_password"
[ngClass]="valid('confirm_password')" [ngClass]="valid('confirm_password')"
placeholder="{{'users.input.confirm_password'|translate}}"> placeholder="{{'users.input.confirm_password'|translate}}">
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group row col-md-8">
<div class="col-md-2">Flags</div>
<div class="col-md-6">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" formControlName="locked" id="locked"> <input class="form-check-input" type="checkbox" value="{{editUser.locked}}" formControlName="locked" id="locked" [attr.disabled]="editMode?null:true">
<label class="form-check-label" for="locked"> <label class="form-check-label" for="locked" >
{{'users.attributes.locked'|translate}} {{'users.attributes.locked'|translate}}
</label> </label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" formControlName="password_change_required" <input class="form-check-input" type="checkbox" value="{{editUser.password_change_required}}" formControlName="password_change_required"
id="password_change_required" checked> id="password_change_required" [attr.disabled]="editMode?null:true">
<label class="form-check-label" for="password_change_required"> <label class="form-check-label" for="password_change_required">
{{'users.attributes.password_change_required'|translate}} {{'users.attributes.password_change_required'|translate}}
</label> </label>
</div> </div>
</div>
</div> </div>
<div class="form-group col-md-8"> <div class="form-group col-md-8" *ngIf="editMode">
<button class="btn btn-primary" type="submit" <button class="btn btn-primary" type="submit"
[disabled]="!userForm.valid">{{'users.add.submit'|translate}}</button> [disabled]="!userForm.valid">{{'users.edit.submit'|translate}}</button>
</div> </div>
<div *ngIf="success" class="alert alert-success" role="alert"> <div *ngIf="success" class="alert alert-success" role="alert">
User <a [routerLink]="['user','users','edit',userid]">{{userid}}</a> was added to the list. User <a [routerLink]="['user','users','edit',userid]">{{userid}}</a> was added to the list.

27
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/users/manage-users-edit/manage-users-edit.component.ts
View File

@ -18,21 +18,40 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import {UserService} from "../../../../services/user.service";
import {FormBuilder, Validators} from "@angular/forms";
import {ManageUsersAddComponent, MustMatch} from "../manage-users-add/manage-users-add.component";
import {environment} from "../../../../../environments/environment";
import {map, switchMap} from 'rxjs/operators';
@Component({ @Component({
selector: 'app-manage-users-edit', selector: 'app-manage-users-edit',
templateUrl: './manage-users-edit.component.html', templateUrl: './manage-users-edit.component.html',
styleUrls: ['./manage-users-edit.component.scss'] styleUrls: ['./manage-users-edit.component.scss']
}) })
export class ManageUsersEditComponent implements OnInit { export class ManageUsersEditComponent extends ManageUsersAddComponent implements OnInit {
userid; editUser;
editMode:boolean=false;
constructor(private route: ActivatedRoute) { constructor(private route: ActivatedRoute, public userService: UserService, public fb: FormBuilder) {
this.route.params.subscribe(params => this.userid=params.userid); super(userService, fb);
this.editUser = this.route.params.pipe(map (params => params.userid ), switchMap(userid => userService.getUser(userid)) ).subscribe(user => {
this.editUser = user;});
} }
ngOnInit(): void { ngOnInit(): void {
} }
valid(field: string): string[] {
if (this.editMode) {
let classArr = super.valid(field);
return classArr.concat('form-control')
} else {
return ['form-control-plaintext'];
}
}
} }

77
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/user.service.ts
View File

@ -24,8 +24,7 @@ import {ErrorResult} from "../model/error-result";
import {Observable, throwError} from "rxjs"; import {Observable, throwError} from "rxjs";
import {Permission} from '../model/permission'; import {Permission} from '../model/permission';
import {PagedResult} from "../model/paged-result"; import {PagedResult} from "../model/paged-result";
import {EntityService} from "../model/entity-service"; import {User} from '../model/user';
import { User } from '../model/user';
import {catchError, map} from "rxjs/operators"; import {catchError, map} from "rxjs/operators";
@Injectable({ @Injectable({
@ -37,25 +36,25 @@ export class UserService implements OnInit, OnDestroy {
permissions: Permission[]; permissions: Permission[];
guestPermissions: Permission[]; guestPermissions: Permission[];
authenticated: boolean; authenticated: boolean;
uiPermissionsDefault = { uiPermissionsDefault = {
'menu': { 'menu': {
'repo':{ 'repo': {
'section':true, 'section': true,
'browse':true, 'browse': true,
'search':true, 'search': true,
'upload':false 'upload': false
}, },
'admin':{ 'admin': {
'section':false, 'section': false,
'config':false, 'config': false,
'status':false, 'status': false,
'reports':false 'reports': false
}, },
'user':{ 'user': {
'section':false, 'section': false,
'manage':false, 'manage': false,
'roles':false, 'roles': false,
'config':false 'config': false
} }
} }
}; };
@ -86,7 +85,7 @@ export class UserService implements OnInit, OnDestroy {
} }
}, },
error: err => { error: err => {
console.log("Could not retrieve permissions "+err); console.log("Could not retrieve permissions " + err);
} }
} }
this.retrievePermissionInfo().subscribe(observer); this.retrievePermissionInfo().subscribe(observer);
@ -172,13 +171,14 @@ export class UserService implements OnInit, OnDestroy {
resetPermissions() { resetPermissions() {
this.deepCopy(this.uiPermissionsDefault, this.uiPermissions); this.deepCopy(this.uiPermissionsDefault, this.uiPermissions);
} }
parsePermissions(permissions: Permission[]) { parsePermissions(permissions: Permission[]) {
this.resetPermissions(); this.resetPermissions();
for ( let perm of permissions) { for (let perm of permissions) {
// console.debug("Checking permission for op: " + perm.operation.name); // console.debug("Checking permission for op: " + perm.operation.name);
switch (perm.operation.name) { switch (perm.operation.name) {
case "archiva-manage-configuration": { case "archiva-manage-configuration": {
if (perm.resource.identifier=='*') { if (perm.resource.identifier == '*') {
this.uiPermissions.menu.admin.section = true; this.uiPermissions.menu.admin.section = true;
this.uiPermissions.menu.admin.config = true; this.uiPermissions.menu.admin.config = true;
this.uiPermissions.menu.admin.reports = true; this.uiPermissions.menu.admin.reports = true;
@ -187,7 +187,7 @@ export class UserService implements OnInit, OnDestroy {
} }
case "archiva-manage-users": { case "archiva-manage-users": {
if (perm.resource.identifier=='*') { if (perm.resource.identifier == '*') {
this.uiPermissions.menu.user.section = true; this.uiPermissions.menu.user.section = true;
this.uiPermissions.menu.user.config = true; this.uiPermissions.menu.user.config = true;
this.uiPermissions.menu.user.manage = true; this.uiPermissions.menu.user.manage = true;
@ -195,7 +195,7 @@ export class UserService implements OnInit, OnDestroy {
} }
} }
case "redback-configuration-edit": { case "redback-configuration-edit": {
if (perm.resource.identifier=='*') { if (perm.resource.identifier == '*') {
this.uiPermissions.menu.user.section = true; this.uiPermissions.menu.user.section = true;
this.uiPermissions.menu.user.config = true; this.uiPermissions.menu.user.config = true;
} }
@ -210,7 +210,7 @@ export class UserService implements OnInit, OnDestroy {
private deepCopy(src: Object, dst: Object) { private deepCopy(src: Object, dst: Object) {
Object.keys(src).forEach((key, idx) => { Object.keys(src).forEach((key, idx) => {
let srcEl = src[key]; let srcEl = src[key];
if (typeof(srcEl)=='object' ) { if (typeof (srcEl) == 'object') {
let dstEl; let dstEl;
if (!dst.hasOwnProperty(key)) { if (!dst.hasOwnProperty(key)) {
dst[key] = {} dst[key] = {}
@ -260,22 +260,35 @@ export class UserService implements OnInit, OnDestroy {
this.authenticated = false; this.authenticated = false;
} }
public query(searchTerm : string, offset : number = 0, limit : number = 10, orderBy : string[] = ['user_id'], order: string = 'asc') : Observable<PagedResult<UserInfo>> { public query(searchTerm: string, offset: number = 0, limit: number = 10, orderBy: string[] = ['user_id'], order: string = 'asc'): Observable<PagedResult<UserInfo>> {
console.log("getUserList " + searchTerm + "," + offset + "," + limit + "," + orderBy + "," + order); console.log("getUserList " + searchTerm + "," + offset + "," + limit + "," + orderBy + "," + order);
if (searchTerm==null) { if (searchTerm == null) {
searchTerm="" searchTerm = ""
} }
if (orderBy==null || orderBy.length==0) { if (orderBy == null || orderBy.length == 0) {
orderBy = ['user_id']; orderBy = ['user_id'];
} }
return this.rest.executeRestCall<PagedResult<UserInfo>>("get", "redback", "users", {'q':searchTerm, 'offset':offset,'limit':limit,'orderBy':orderBy,'order':order}); return this.rest.executeRestCall<PagedResult<UserInfo>>("get", "redback", "users", {
'q': searchTerm,
'offset': offset,
'limit': limit,
'orderBy': orderBy,
'order': order
});
} }
public addUser(user : User) : Observable<string> { public addUser(user: User): Observable<string> {
return this.rest.executeResponseCall<string>("post", "redback", "users", user).pipe( return this.rest.executeResponseCall<string>("post", "redback", "users", user).pipe(
catchError( ( error: HttpErrorResponse) => { catchError((error: HttpErrorResponse) => {
return throwError(this.rest.getTranslatedErrorResult(error)); return throwError(this.rest.getTranslatedErrorResult(error));
}),map( (httpResponse : HttpResponse<string>) => httpResponse.headers.get('Location'))); }), map((httpResponse: HttpResponse<string>) => httpResponse.headers.get('Location')));
}
public getUser(userid: string): Observable<UserInfo> {
return this.rest.executeRestCall<UserInfo>("get", "redback", "users/" + userid, null).pipe(
catchError((error: HttpErrorResponse) => {
return throwError(this.rest.getTranslatedErrorResult(error));
}));
} }
} }

1
archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/environments/environment.ts
View File

@ -28,6 +28,7 @@ export const environment = {
client_id:'archiva_web_client', client_id:'archiva_web_client',
baseUrl: 'http://localhost:8080', baseUrl: 'http://localhost:8080',
restPath: '/archiva/api/v2', restPath: '/archiva/api/v2',
minUserIdLength: 8,
servicePaths: { servicePaths: {
archiva:"archiva", archiva:"archiva",
redback:"redback", redback:"redback",