From: Martin Stockhammer Date: Mon, 7 Dec 2020 22:00:37 +0000 (+0100) Subject: Updating angular web app X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5732208f5bbe4c082f6d6b67444dec36a7964814;p=archiva.git Updating angular web app --- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/access-token.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/access-token.spec.ts index e222aeb09..1d83ed569 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/access-token.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/access-token.spec.ts @@ -7,8 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.spec.ts index a77257168..7945fb457 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.spec.ts @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { Application } from './application'; describe('Application', () => { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.ts index 857d080a8..69878bf00 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/application.ts @@ -1,2 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + export class Application { } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.spec.ts index c95251c79..52eaabf4c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.spec.ts @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { RoleTemplate } from './role-template'; describe('RoleTemplate', () => { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.ts index 82363d3a0..01a5bd963 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role-template.ts @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + export class RoleTemplate { id:string name:string diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role.ts index b2b9bd527..819d0f1e5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/model/role.ts @@ -34,5 +34,7 @@ export class Role { // Web Internal attributes enabled: boolean = true level:number = -1 + root_path: Array + assigned_origin: boolean; } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html index 4f95595af..1f5e246fc 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html @@ -8,7 +8,6 @@ ~ with the License. You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -89,7 +88,7 @@ [attr.disabled]="userForm.valid?null:true">{{'users.add.submit'|translate}} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.scss b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.scss index e69de29bb..343c3b1c0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.scss +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.scss @@ -0,0 +1,18 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.spec.ts index b53258463..fdc5912ea 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.spec.ts @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ManageUsersRolesComponent } from './manage-users-roles.component'; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.ts index 26de0d8e9..1beb1f0e0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/manage-users-roles.component.ts @@ -1,54 +1,125 @@ -import { Component, OnInit } from '@angular/core'; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import {AfterViewInit, Component, EventEmitter, OnInit, Output} from '@angular/core'; import { Role } from '@app/model/role'; import {UserService} from "@app/services/user.service"; import {ActivatedRoute} from "@angular/router"; -import {filter, map, switchMap} from "rxjs/operators"; +import {catchError, filter, map, multicast, share, switchMap, tap} from "rxjs/operators"; import {RoleTree} from "@app/model/role-tree"; import {RoleService} from "@app/services/role.service"; import {RoleTemplate} from "@app/model/role-template"; -import {Observable} from "rxjs"; +import {Observable, of} from "rxjs"; import {Util} from "@app/modules/shared/shared.module"; +import { RoleResult } from './role-result'; +import {fromArray} from "rxjs/internal/observable/fromArray"; +import {ErrorResult} from "@app/model/error-result"; +import {HttpResponse} from "@angular/common/http"; @Component({ selector: 'app-manage-users-roles', templateUrl: './manage-users-roles.component.html', styleUrls: ['./manage-users-roles.component.scss'] }) -export class ManageUsersRolesComponent implements OnInit { +export class ManageUsersRolesComponent implements OnInit, AfterViewInit { - baseRoles : Array + roles$ : Observable + currentRoles: RoleResult guest: Role registered: Role - // Map of (resource, [roles]) - templateRoleInstances: Map> templateRoles$: Observable; + userid: string; + success:boolean=true; + errors: ErrorResult[]=[]; + saved:boolean=false; - constructor(private route : ActivatedRoute, private userService : UserService, private roleService : RoleService) { - this.route.params.pipe( - map(params => params.userid), filter(userid => userid!=null), switchMap(userid => userService.userRoleTree(userid))).subscribe(roleTree => { - this.parseRoleTree(roleTree); - }); + @Output() + userIdEvent: EventEmitter = new EventEmitter(true); + constructor(private route : ActivatedRoute, private userService : UserService, private roleService : RoleService) { } ngOnInit(): void { + this.roles$ = this.route.params.pipe( + map(params => params.userid), filter(userid => userid != null), + tap(userid => this.userid = userid), + tap(userid=>{ + this.userIdEvent.emit(userid) + }), + switchMap(userid => { + return this.userService.userRoleTree(userid) + }), + map(roleTree=>this.parseRoleTree(roleTree)), + // This is to avoid multiple userService.userRoleTree() calls for template and base roles + share() + ); this.templateRoles$ = this.roleService.getTemplates(); } - private parseRoleTree(roleTree:RoleTree): void { - let roleTable = []; - for(let rootRole of roleTree.root_roles) { - roleTable = this.recurseRoleTree(rootRole, roleTable, 0); + private parseRoleTree(roleTree:RoleTree): RoleResult { + let roleResult = new RoleResult(); + let rootRoles = roleTree.root_roles; + rootRoles.sort((a, b)=>{ + if (b.id=='guest') { + return 1; + } else if (b.id=='registered-user') { + return 1; + } else { + return -1; + } + }) + for (let rootRole of rootRoles) { + this.recurseTree(rootRole, roleResult, 0, null); + } + return roleResult; + } + + private recurseTree(role:Role,roleResult:RoleResult, level:number, parent: Role) : void { + let newLevel=level; + if (parent!=null) { + if (role.root_path==null) { + role.root_path = (parent.root_path == null ? [] : parent.root_path.slice()); + } + role.root_path.push(parent.id) } - this.baseRoles = roleTable; - let templateMap : Map> = new Map>(); - for (let rootRole of roleTree.root_roles) { - templateMap = this.recurseTemplates(rootRole, templateMap, 0); + role.assigned_origin = role.assigned; + if (role.template_instance) { + newLevel = this.parseTemplateRole(role,roleResult.templateRoleInstances,newLevel) + } else { + newLevel = this.parseBaseRole(role, roleResult.baseRoles, newLevel) + } + for(let childRole of role.children) { + let recurseChild = childRole; + if (childRole.template_instance) { + if (roleResult.templateRoleInstances.has(childRole.resource) && roleResult.templateRoleInstances.get(childRole.resource).has(childRole.model_id)) { + recurseChild = roleResult.templateRoleInstances.get(childRole.resource).get(childRole.model_id) + } + } else { + let existingBaseRole = roleResult.baseRoles.find(role => role.id == childRole.id) + if (existingBaseRole != null) { + recurseChild = existingBaseRole; + } + } + this.recurseTree(recurseChild, roleResult, newLevel, role); } - this.templateRoleInstances = templateMap; } - private recurseRoleTree(role:Role, roles : Array, level:number) : Array { + private parseBaseRole(role:Role, roles : Array, level:number) : number { if (role.id=='guest') { this.guest = role; } else if (role.id=='registered-user') { @@ -56,34 +127,32 @@ export class ManageUsersRolesComponent implements OnInit { } role.enabled=true; let newLevel; - if (!role.template_instance && role.assignable) { + if (role.assignable) { role.level=level roles.push(role); newLevel = level+1; } else { newLevel = level; } - for(let childRole of role.children) { - roles = this.recurseRoleTree(childRole, roles, newLevel); - } - return roles; + return newLevel; } - private recurseTemplates(role:Role, roles : Map>, level:number) : Map> { + private parseTemplateRole(role:Role, roles : Map>, level:number) : number { + let newLevel=level; role.enabled=true; - if (role.template_instance && role.assignable) { + if (role.assignable) { role.level=level - let roleList = roles.get(role.resource) - if (roleList==null) { - roleList = [] + let modelRoleMap = roles.get(role.resource) + if (modelRoleMap==null) { + modelRoleMap = new Map(); } - roleList.push(role); - roles.set(role.resource, roleList); - } - for(let childRole of role.children) { - roles = this.recurseTemplates(childRole, roles, level+1); + modelRoleMap.set(role.model_id, role); + roles.set(role.resource, modelRoleMap); + newLevel = level + 1; + } else { + newLevel = level; } - return roles; + return newLevel; } getRoleContent(role:Role) : string { @@ -101,55 +170,192 @@ export class ManageUsersRolesComponent implements OnInit { changeBaseAssignment(role : Role, event) { let cLevel=-1 - let assignStatus; + let assignStatus + // Guest is special and exclusive if (role.id==this.guest.id) { if (role.assigned) { - for (let cRole of this.baseRoles) { + this.currentRoles.baseRoles.forEach((cRole:Role)=> { if (cRole.id != this.guest.id) { cRole.assigned = false; cRole.enabled=true; } - } + + }) role.enabled = false; + this.currentRoles.templateRoleInstances.forEach((value, key)=>{ + value.forEach((templateInstance, modelId) => { + templateInstance.assigned = false; + templateInstance.enabled = true; + + }); + }) } } else { this.guest.enabled = true; - for (let cRole of this.baseRoles) { + this.currentRoles.baseRoles.forEach((cRole)=> { if (cRole.id == role.id) { - console.log("Value: " + cRole.assigned); cLevel = cRole.level; assignStatus = cRole.assigned; if (assignStatus) { this.guest.assigned = false; + this.guest.enabled = true; } else { - if (!this.baseRoles.find(role=>role.assigned)) { + if (!this.isAnyAssigned()) { this.guest.assigned=true; + this.guest.enabled = false; } } } else { - console.log("Level " + cLevel); - if (cLevel >= 0 && cLevel < cRole.level) { + if (cLevel >= 0 && cLevel < cRole.level && cRole.root_path.find(pRoleId => pRoleId==role.id)) { if (assignStatus) { cRole.assigned = true; cRole.enabled = false; } else { cRole.enabled = true; + cRole.assigned=cRole.assigned_origin } } else if (cLevel >= 0) { - break; + return; } } + }) + this.currentRoles.templateRoleInstances.forEach((value, key)=>{ + value.forEach((templateInstance, modelId) => { + if(templateInstance.root_path.find(roleId => roleId==role.id)) { + if (role.assigned) { + templateInstance.assigned = true; + templateInstance.enabled = false + } else { + templateInstance.enabled = true; + templateInstance.assigned=templateInstance.assigned_origin + } + } + } + ) + }) + } + } + + isAnyAssigned() : boolean { + if (Array.from(this.currentRoles.baseRoles.values()).find(role=>role.assigned)!=null) { + return true; + } + return Array.from(this.currentRoles.templateRoleInstances.values()).map((roleMap: Map) => Array.from(roleMap.values())) + .find(values=>values.find(role=>role.assigned))!=null + } + + + + + changeTemplateAssignment(role : Role, event) { + if (role.assigned) { + if (this.guest.assigned) { + this.guest.assigned = false; + this.guest.enabled = true; } + if (!this.registered.assigned) { + this.registered.assigned=true; + } + } else { + if (!this.isAnyAssigned()) { + this.guest.assigned=true; + this.guest.enabled = false; + } + } } - changeInstAssignment(role : Role, event) { - console.log("Change " + role.id); - console.log("Assignment changed "+JSON.stringify(event)); - console.log("Event target "+event.target); + getInstanceContent(template:RoleTemplate, roles:Map) : Role { + return roles.get(template.id) + } + + saveAssignments() { + this.saved=false; + this.success=true; + this.errors = []; + let assignmentMap : Map = new Map(this.currentRoles.baseRoles.filter(role => role.assigned != role.assigned_origin).map(role => [role.id, role])); + let assignments : Array = [] + let unassignments : Array = [] + assignmentMap.forEach((role, roleId)=>{ + if (role.level>0) { + for(let parentId of role.root_path) { + if (assignmentMap.has(parentId) && assignmentMap.get(parentId).assigned) { + return; + } + } + } + if (role.assigned) { + assignments.push(role); + } else { + unassignments.push(role); + } + }) + this.currentRoles.templateRoleInstances.forEach((templMap, resource)=> { + templMap.forEach((role, modelId)=> { + if (role.assigned!=role.assigned_origin) { + if (role.level>0) { + for(let parentId of role.root_path) { + if (assignmentMap.has(parentId) && assignmentMap.get(parentId).assigned) { + return; + } + } + } + if (role.assigned) { + assignments.push(role); + } else { + unassignments.push(role); + } + } + }) + } + ) + fromArray(assignments).pipe(switchMap((role) => this.roleService.assignRole(role.id, this.userid)), + catchError((err: ErrorResult, caught) => { + this.success = false; + this.errors.push(err); + return []; + } + ) + ).subscribe((result:HttpResponse)=> { + this.updateRole(result.body, true); + this.saved=true; + } + ); + fromArray(unassignments).pipe(switchMap((role) => this.roleService.unAssignRole(role.id, this.userid)), + catchError((err: ErrorResult, caught) => { + this.success = false; + this.errors.push(err); + return []; + } + ) + ).subscribe(result=>{ + this.updateRole(result.body,false); + this.saved=true; + }); + this.saved=true; + } + + private updateRole(role:Role, assignment:boolean) : void { + if (role!=null) { + if (role.template_instance) { + this.currentRoles.templateRoleInstances.forEach((templMap, resource)=>{ + templMap.forEach((tmplRole, modelId)=> { + if (tmplRole.id == role.id) { + Util.deepCopy(role, tmplRole, false); + tmplRole.assigned = assignment; + } + } + ) + }) + } else { + let target = this.currentRoles.baseRoles.find(baseRole => baseRole.id == role.id); + Util.deepCopy(role, target, false); + target.assigned = assignment; + } + } } - getInstanceContent(template:RoleTemplate, roles:Array) : Role { - return roles.find(role=>role.model_id==template.id) + ngAfterViewInit(): void { + this.roles$.subscribe(roleResult => this.currentRoles = roleResult); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/role-result.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/role-result.ts new file mode 100644 index 000000000..83b854ea6 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-roles/role-result.ts @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import {Role} from "@app/model/role"; + +export class RoleResult { + // Map of (roleId, Role) + baseRoles: Array = []; + // Map of (resource, [(modelId, role), ...]) + templateRoleInstances: Map> = new Map>(); +} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.html index d5c5b420c..ebe5bb437 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.html @@ -8,7 +8,6 @@ ~ with the License. You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,11 +24,11 @@ {{'users.add.head' |translate }}
  • - {{'users.edit.head' |translate }} + {{'users.edit.head' |translate }}
  • - {{'users.roles.head' |translate }} + {{'users.roles.head' |translate }}
    • - \ No newline at end of file + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.scss b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.scss index 573c9ef45..343c3b1c0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.scss +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.scss @@ -8,7 +8,6 @@ * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.spec.ts index 9e991b454..20b1440a5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.spec.ts @@ -8,7 +8,6 @@ * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.ts index dd72616bb..e33bdcd4c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users/manage-users.component.ts @@ -8,7 +8,6 @@ * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,7 +16,12 @@ * under the License. */ -import { Component, OnInit } from '@angular/core'; +import {AfterViewInit, Component, OnInit} from '@angular/core'; +import {ActivatedRoute, Params} from "@angular/router"; +import {iif, Observable, of, pipe, merge, combineLatest} from "rxjs"; +import {combineAll, filter, map, mergeMap, share, switchMap, tap} from 'rxjs/operators'; +import {flatMap} from "rxjs/internal/operators"; +import {fromArray} from "rxjs/internal/observable/fromArray"; @Component({ selector: 'app-manage-users', @@ -26,9 +30,49 @@ import { Component, OnInit } from '@angular/core'; }) export class ManageUsersComponent implements OnInit { - constructor() { } + userId$:Observable + + constructor(private route : ActivatedRoute) { + } ngOnInit(): void { } + + + onChildActivate(componentReference) { + // console.log("Activating "+componentReference+" - "+JSON.stringify(componentReference,getCircularReplacer())) + if (componentReference.userIdEvent!=null) { + let componentEmit : Observable = componentReference.userIdEvent.pipe( + tap(userid=>console.log("Event "+componentReference.class+" "+userid)), + map((userid: string) => this.getSubPath(userid))); + if (this.userId$!=null) { + this.userId$ = merge(this.userId$, componentEmit) + } else { + this.userId$ = componentEmit; + } + } + } + + getSubPath(userid:string) { + if (userid!=null && userid.length>0) { + return '/' + userid; + } else { + return ''; + } + } + } + +const getCircularReplacer = () => { + const seen = new WeakSet(); + return (key, value) => { + if (typeof value === "object" && value !== null) { + if (seen.has(value)) { + return; + } + seen.add(value); + } + return value; + }; +}; \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/shared.module.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/shared.module.ts index 0ff9025b3..1030390d8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/shared.module.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/shared.module.ts @@ -71,7 +71,7 @@ export function httpTranslateLoader(http: HttpClient) { } export const Util = { - deepCopy(src: Object, dst: Object) { + deepCopy(src: Object, dst: Object, overwriteWithEmptyString:boolean=true) { Object.keys(src).forEach((key, idx) => { let srcEl = src[key]; if (typeof (srcEl) == 'object') { @@ -81,6 +81,14 @@ export const Util = { } dstEl = dst[key]; this.deepCopy(srcEl, dstEl); + } else if (typeof(srcEl)=='string') { + if (overwriteWithEmptyString) { + dst[key]=srcEl + } else { + if ((srcEl as string).length>0) { + dst[key]=srcEl + } + } } else { // console.debug("setting " + key + " = " + srcEl); dst[key] = srcEl; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.spec.ts index 159b1ee32..039ca3f5e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.spec.ts @@ -7,8 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.ts index 52a55e6b2..84af0d6d1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/archiva-request.service.ts @@ -7,8 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.spec.ts index 03c7b2310..d0382d8d1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.spec.ts @@ -7,8 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.ts index 519eb27e0..422d3398e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/authentication.service.ts @@ -7,8 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.spec.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.spec.ts index 275b25a3f..6328dbb54 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.spec.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.spec.ts @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { TestBed } from '@angular/core/testing'; import { RoleService } from './role.service'; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.ts index f7e1bc823..f92a4a76a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.ts +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/role.service.ts @@ -1,7 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import { Injectable } from '@angular/core'; import {ArchivaRequestService} from "@app/services/archiva-request.service"; import {RoleTemplate} from "@app/model/role-template"; import { Observable } from 'rxjs'; +import { Role } from '@app/model/role'; +import {HttpResponse} from "@angular/common/http"; @Injectable({ providedIn: 'root' @@ -14,4 +34,12 @@ export class RoleService { return this.rest.executeRestCall("get", "redback", "roles/templates", null); } + public assignRole(roleId, userId) : Observable> { + return this.rest.executeResponseCall("put", "redback", "roles/" + roleId + "/user/" + userId, null); + } + + public unAssignRole(roleId, userId) : Observable> { + return this.rest.executeResponseCall("delete", "redback", "roles/" + roleId + "/user/" + userId, null); + } + } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/assets/i18n/en.json b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/assets/i18n/en.json index 2be44e13f..f12c6f20b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/assets/i18n/en.json +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/assets/i18n/en.json @@ -116,7 +116,15 @@ } }, "roles": { - "head": "Edit Roles" + "head": "Edit Roles", + "base_roles": "Roles", + "template_roles": "Repository Roles", + "table": { + "role": "Role", + "scope": "Scope", + "assign": "Assign", + "repository": "Repository" + } } }, "search": { @@ -133,7 +141,8 @@ }, "button": { "yes": "Yes", - "no": "No" + "no": "No", + "save": "Save Changes" } }, "password": {