Added create and edit resource policy link

This commit is contained in:
Giuseppe Digilio
2020-04-02 18:57:48 +02:00
parent 8913a45a6b
commit 7f6c88164b
2 changed files with 66 additions and 8 deletions

View File

@@ -2,10 +2,10 @@
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th colspan="6">
<th colspan="7">
<p class="d-flex justify-content-between align-items-center m-0">
{{ 'resource-policies.table.headers.title.for.' + resourceKey | translate }} {{resourceUUID}}
<button class="btn btn-outline-primary float-right">
<button class="btn btn-outline-primary float-right" (click)="createResourcePolicy()">
{{'resource-policies.add.for.' + resourceKey | translate}}
</button>
</p>
@@ -15,6 +15,7 @@
<th>{{'resource-policies.table.headers.id' | translate}}</th>
<th>{{'resource-policies.table.headers.name' | translate}}</th>
<th>{{'resource-policies.table.headers.action' | translate}}</th>
<th>{{'resource-policies.table.headers.eperson' | translate}}</th>
<th>{{'resource-policies.table.headers.group' | translate}}</th>
<th>{{'resource-policies.table.headers.date.start' | translate}}</th>
<th>{{'resource-policies.table.headers.date.end' | translate}}</th>
@@ -22,13 +23,22 @@
</thead>
<tbody>
<tr *ngFor="let policy of (getResourcePolicies() | async)?.payload?.page; trackById">
<th scope="row">{{policy.id}}</th>
<th scope="row">
{{policy.id}}
<button class="btn btn-link pt-0 pb-0" (click)="editResourcePolicy(policy)">
{{'resource-policies.table.headers.edit' | translate}}
</button>
</th>
<td>{{policy.name}}</td>
<td>{{policy.action}}</td>
<td *ngIf="(hasEPerson(policy) | async)">
{{getEPersonName(policy) | async}}
</td>
<td *ngIf="!(hasEPerson(policy) | async)"></td>
<td *ngIf="(hasGroup(policy) | async)">
{{getGroupName(policy) | async}}
<button class="btn btn-link pt-0 pb-0" (click)="redirectToGroupEditPage(policy)">
{{'resource-policies.table.headers.group.edit' | translate}}
{{'resource-policies.table.headers.edit' | translate}}
</button>
</td>
<td *ngIf="!(hasGroup(policy) | async)"></td>

View File

@@ -1,5 +1,5 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable, Subscription } from 'rxjs';
import { map } from 'rxjs/operators';
@@ -13,6 +13,8 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { Group } from '../../core/eperson/models/group.model';
import { GroupDataService } from '../../core/eperson/group-data.service';
import { hasValue, isNotEmpty } from '../empty.util';
import { EPerson } from '../../core/eperson/models/eperson.model';
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
@Component({
selector: 'ds-resource-policies',
@@ -51,15 +53,21 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
/**
* Initialize instance variables
*
* @param {ChangeDetectorRef} cdr
* @param {DSONameService} dsoNameService
* @param {EPersonDataService} ePersonService
* @param {GroupDataService} groupService
* @param {ResourcePolicyService} resourcePolicyService
* @param {ActivatedRoute} route
* @param {Router} router
*/
constructor(
private cdr: ChangeDetectorRef,
private dsoNameService: DSONameService,
private ePersonService: EPersonDataService,
private groupService: GroupDataService,
private resourcePolicyService: ResourcePolicyService,
private route: ActivatedRoute,
private router: Router
) {
}
@@ -74,6 +82,34 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
}
/**
* Redirect to resource policy creation page
*/
createResourcePolicy(): void {
this.router.navigate([`../${this.resourceUUID}/create`], { relativeTo: this.route })
}
/**
* Redirect to resource policy editing page
*
* @param policy The resource policy
*/
editResourcePolicy(policy: ResourcePolicy): void {
this.router.navigate([`../${this.resourceUUID}/${policy.id}/edit`], { relativeTo: this.route })
}
/**
* Return the ePerson's name which the given policy is linked to
*
* @param policy The resource policy
*/
getEPersonName(policy: ResourcePolicy): Observable<string> {
return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
getFirstSucceededRemoteDataPayload(),
map((eperson: EPerson) => this.dsoNameService.getName(eperson))
)
}
/**
* Return the group's name which the given policy is linked to
*
@@ -82,8 +118,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
getGroupName(policy: ResourcePolicy): Observable<string> {
return this.groupService.findByHref(policy._links.group.href).pipe(
getFirstSucceededRemoteDataPayload(),
// A group has not dc.title metadata so is not possible to use DSONameService to retrieve name
map((group: Group) => group.name)
map((group: Group) => this.dsoNameService.getName(group))
)
}
@@ -96,6 +131,19 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
return this.resourcePolicies$;
}
/**
* Check whether the given policy is linked to a ePerson
*
* @param policy The resource policy
* @return an observable that emits true when the policy is linked to a ePerson, false otherwise
*/
hasEPerson(policy): Observable<boolean> {
return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
getFirstSucceededRemoteDataPayload(),
map((eperson: EPerson) => isNotEmpty(eperson))
)
}
/**
* Check whether the given policy is linked to a group
*