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

[DURACOM-234] Remove assertions on isResponsePending in favour of remote data operators

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-04-02 18:54:00 +02:00
parent b49d883e0b
commit 660cf7e4dd
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
View File

@@ -7,13 +7,13 @@ import {
Input,
OnInit,
} from '@angular/core';
import { find } from 'rxjs/operators';
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
import { RemoteData } from '../../../../core/data/remote-data';
import { GroupDataService } from '../../../../core/eperson/group-data.service';
import { Group } from '../../../../core/eperson/models/group.model';
import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model';
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
import { isEmpty } from '../../../../shared/empty.util';
/**
@@ -55,13 +55,15 @@ export class SubmissionSectionUploadAccessConditionsComponent implements OnInit
this.accessConditions.forEach((accessCondition: ResourcePolicy) => {
if (isEmpty(accessCondition.name)) {
this.groupService.findByHref(accessCondition._links.group.href).pipe(
find((rd: RemoteData<Group>) => !rd.isResponsePending && rd.hasSucceeded))
.subscribe((rd: RemoteData<Group>) => {
getFirstCompletedRemoteData(),
).subscribe((rd: RemoteData<Group>) => {
if (rd.hasSucceeded) {
const group: Group = rd.payload;
const accessConditionEntry = Object.assign({}, accessCondition);
accessConditionEntry.name = this.dsoNameService.getName(group);
this.accessConditionsList.push(accessConditionEntry);
});
}
});
} else {
this.accessConditionsList.push(accessCondition);
}