hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

71764: ItemStatusComponent BehaviorSubject for updating operations

Browse Source
This commit is contained in:
Kristof De Langhe
2020-07-14 15:13:21 +02:00
parent 7f6bd680b2
commit 3afe8c0b1d
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+item-page/edit-item-page/item-status/item-status.component.html
View File

@@ -15,7 +15,7 @@
<a [routerLink]="getItemPage((itemRD$ | async)?.payload)">{{getItemPage((itemRD$ | async)?.payload)}}</a> <a [routerLink]="getItemPage((itemRD$ | async)?.payload)">{{getItemPage((itemRD$ | async)?.payload)}}</a>
</div> </div>
<div *ngFor="let operation of operations" class="w-100" [ngClass]="{'pt-3': operation}"> <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
<ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation> <ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation>
</div> </div>
</div> </div>

47
src/app/+item-page/edit-item-page/item-status/item-status.component.ts
View File

@@ -10,6 +10,7 @@ import { getItemEditPath, getItemPageRoute } from '../../item-page-routing.modul
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
import { hasValue } from '../../../shared/empty.util'; import { hasValue } from '../../../shared/empty.util';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
@Component({ @Component({
selector: 'ds-item-status', selector: 'ds-item-status',
@@ -43,7 +44,7 @@ export class ItemStatusComponent implements OnInit {
* The possible actions that can be performed on the item * The possible actions that can be performed on the item
* key: id value: url to action's component * key: id value: url to action's component
*/ */
operations: ItemOperation[]; operations$: BehaviorSubject<ItemOperation[]> = new BehaviorSubject<ItemOperation[]>([]);
/** /**
* The keys of the actions (to loop over) * The keys of the actions (to loop over)
@@ -51,8 +52,7 @@ export class ItemStatusComponent implements OnInit {
actionsKeys; actionsKeys;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private authorizationService: AuthorizationDataService, private authorizationService: AuthorizationDataService) {
private changeDetection: ChangeDetectorRef) {
} }
ngOnInit(): void { ngOnInit(): void {
@@ -72,38 +72,43 @@ export class ItemStatusComponent implements OnInit {
i18n example: 'item.edit.tabs.status.buttons.<key>.label' i18n example: 'item.edit.tabs.status.buttons.<key>.label'
The value is supposed to be a href for the button The value is supposed to be a href for the button
*/ */
this.operations = []; const operations = [];
this.operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations')); operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations'));
this.operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper')); operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper'));
this.operations.push(undefined); operations.push(undefined);
// Store the index of the "withdraw" or "reinstate" operation, because it's added asynchronously // Store the index of the "withdraw" or "reinstate" operation, because it's added asynchronously
const index = this.operations.length - 1; const indexOfWithdrawReinstate = operations.length - 1;
if (item.isDiscoverable) {
operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private'));
} else {
operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public'));
}
operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete'));
operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move'));
this.operations$.next(operations);
if (item.isWithdrawn) { if (item.isWithdrawn) {
this.authorizationService.isAuthorized(FeatureID.ReinstateItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => { this.authorizationService.isAuthorized(FeatureID.ReinstateItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => {
const newOperations = [...this.operations$.value];
if (authorized) { if (authorized) {
this.operations[index] = new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate'); newOperations[indexOfWithdrawReinstate] = new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate');
} else { } else {
this.operations[index] = undefined; newOperations[indexOfWithdrawReinstate] = undefined;
} }
this.changeDetection.detectChanges(); this.operations$.next(newOperations);
}); });
} else { } else {
this.authorizationService.isAuthorized(FeatureID.WithdrawItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => { this.authorizationService.isAuthorized(FeatureID.WithdrawItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => {
const newOperations = [...this.operations$.value];
if (authorized) { if (authorized) {
this.operations[index] = new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw'); newOperations[indexOfWithdrawReinstate] = new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw');
} else { } else {
this.operations[index] = undefined; newOperations[indexOfWithdrawReinstate] = undefined;
} }
this.changeDetection.detectChanges(); this.operations$.next(newOperations);
}); });
} }
if (item.isDiscoverable) {
this.operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private'));
} else {
this.operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public'));
}
this.operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete'));
this.operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move'));
}); });
} }