MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MaDgIK:4231b65880df19494dbde5ecbbbc17af63f9ca9b
Branches Tags
MaDgIK:master
MaDgIK:plugins-functionality
MaDgIK:umbrella
MaDgIK:develop
MaDgIK:on-push-strategy
MaDgIK:recommendations-functionality
MaDgIK:angular-16-irish-monitor
MaDgIK:grouped-queries
MaDgIK:develop-filters
MaDgIK:deprecated-angular-upgrade
MaDgIK:explore-redesign
MaDgIK:data-transfer-v2
MaDgIK:deprecated-master
..
compare: MaDgIK:ac46ecb99721e9e384a70e3522b7cc40d0b17f6e
Branches Tags
MaDgIK:plugins-functionality
MaDgIK:master
MaDgIK:umbrella
MaDgIK:develop
MaDgIK:on-push-strategy
MaDgIK:recommendations-functionality
MaDgIK:angular-16-irish-monitor
MaDgIK:grouped-queries
MaDgIK:develop-filters
MaDgIK:deprecated-angular-upgrade
MaDgIK:explore-redesign
MaDgIK:data-transfer-v2
MaDgIK:deprecated-master

No commits in common. "4231b65880df19494dbde5ecbbbc17af63f9ca9b" and "ac46ecb99721e9e384a70e3522b7cc40d0b17f6e" have entirely different histories.
4231b65880 ... ac46ecb997

2 changed files with 12 additions and 15 deletions
Show Stats Expand all files Collapse all files

25
dashboard/users/role-users/role-users.component.ts
View File

@ -44,9 +44,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
@Input()
public id: string;
@Input()
set type(type: string) {
this._type = Role.mapType(type);
}
public type: string;
@Input()
public name: string;
@Input()
@ -92,7 +90,6 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
@ViewChild('deletePendingModal') deletePendingModal: AlertModal;
@ViewChild('createRoleModal') createRoleModal: AlertModal;
public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
private _type: string;
constructor(private userRegistryService: UserRegistryService,
private userManagementService: UserManagementService,
@ -146,7 +143,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
updateLists() {
this.loadActive = true;
this.loadPending = true;
this.subs.push(this.userRegistryService.getActive(this._type, this.id, this.role, true).subscribe(users => {
this.subs.push(this.userRegistryService.getActive(this.type, this.id, this.role, true).subscribe(users => {
this.active = users;
this.filterActiveBySearch(this.filterForm.value.active);
this.loadActive = false;
@ -159,7 +156,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
}
this.loadActive = false;
}));
this.subs.push(this.userRegistryService.getPending(this._type, this.id, this.role, true).subscribe(users => {
this.subs.push(this.userRegistryService.getPending(this.type, this.id, this.role, true).subscribe(users => {
this.pending = users;
this.filterPendingBySearch(this.filterForm.value.pending);
this.loadPending = false;
@ -211,8 +208,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
this.createRoleModal.okButtonLeft = false;
this.createRoleModal.okButtonText = 'Create';
this.roleFb = this.fb.group({
name: this.fb.control(Role.roleName(this._type, this.id), Validators.required),
description: this.fb.control(Role.roleName(this._type, this.id), Validators.required)
name: this.fb.control(Role.roleName(this.type, this.id), Validators.required),
description: this.fb.control(Role.roleName(this.type, this.id), Validators.required)
});
setTimeout(() => {
this.roleFb.get('name').disable();
@ -223,7 +220,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
deleteActive() {
this.loadActive = true;
this.subs.push(this.userRegistryService.remove(this._type, this.id, this.selectedUser, this.role).subscribe(() => {
this.subs.push(this.userRegistryService.remove(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
this.active = this.active.filter(user => user.email != this.selectedUser);
if (this.currentActivePage.length === 0) {
this.activePage = 1;
@ -241,7 +238,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
deletePending() {
this.loadPending = true;
this.subs.push(this.userRegistryService.cancelInvitation(this._type, this.id, this.selectedUser, this.role).subscribe(() => {
this.subs.push(this.userRegistryService.cancelInvitation(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
this.pending = this.pending.filter(user => user != this.selectedUser);
this.filterPendingBySearch(this.filterForm.value.pending);
if (this.currentPendingPage.length === 0) {
@ -268,7 +265,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
let current = null;
let invitations = (<Array<any>>this.emailsForm.value).map(email => {
current = email;
return this.userRegistryService.invite(this._type, this.id, {
return this.userRegistryService.invite(this.type, this.id, {
link: this.link,
email: this.emailComposer(this.name, email, this.role)
}, this.role).pipe(catchError(error => {
@ -311,7 +308,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
createGroup() {
this.loadActive = true;
this.loadPending = true;
this.userRegistryService.createRole(this._type, this.id).subscribe(() => {
this.userRegistryService.createRole(this.type, this.id).subscribe(() => {
NotificationHandler.rise('Group has been <b> successfully created</b>');
this.updateLists();
}, error => {
@ -339,11 +336,11 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
}
public get isManager(): boolean {
return this.isCurator || !!Session.isManager(this._type, this.id, this.user);
return this.isCurator || !!Session.isManager(this.type, this.id, this.user);
}
public get isCurator(): boolean {
return this.isPortalAdmin || !!Session.isCurator(this._type, this.user);
return this.isPortalAdmin || !!Session.isCurator(this.type, this.user);
}
public get isPortalAdmin(): boolean {

2
role-verification/role-verification.component.ts
View File

@ -73,7 +73,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
public id: string;
@Input()
set type(type: string) {
this._type = Role.GROUP + Role.mapType(type);
this._type = Role.GROUP + type;
}
@Input()
public name: string;