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

[CST-5674] Fix; enable policy and action type editing; test

Browse Source
This commit is contained in:
Davide Negretti
2022-05-04 11:35:54 +02:00
parent bb3cc1c619
commit 9173b9db60
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
View File

@@ -222,8 +222,6 @@ describe('ResourcePolicyFormComponent test suite', () => {
testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
testComp = testFixture.componentInstance;
testComp.resourcePolicy = resourcePolicy;
fixture.detectChanges();
});
afterEach(() => {

59
src/app/shared/resource-policies/form/resource-policy-form.component.ts
View File

@@ -161,27 +161,31 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
this.formId = this.formService.getUniqueId('resource-policy-form');
this.formModel = this.buildResourcePolicyForm();
const epersonRD$ = this.ePersonService.findByHref(this.resourcePolicy._links.eperson.href, false).pipe(
getFirstSucceededRemoteData()
);
const groupRD$ = this.groupService.findByHref(this.resourcePolicy._links.group.href, false).pipe(
getFirstSucceededRemoteData()
);
const dsoRD$: Observable<RemoteData<DSpaceObject>> = observableCombineLatest([epersonRD$, groupRD$]).pipe(
map((rdArr: RemoteData<DSpaceObject>[]) => {
return rdArr.find((rd: RemoteData<DSpaceObject>) => isNotEmpty(rd.payload));
}),
hasValueOperator(),
);
this.subs.push(
dsoRD$.pipe(
filter(() => this.isActive),
).subscribe((dsoRD: RemoteData<DSpaceObject>) => {
this.resourcePolicyGrant = dsoRD.payload;
this.navActiveId = String(dsoRD.payload.type);
this.resourcePolicyTargetName$.next(this.getResourcePolicyTargetName());
})
);
if (this.isBeingEdited()) {
const epersonRD$ = this.ePersonService.findByHref(this.resourcePolicy._links.eperson.href, false).pipe(
getFirstSucceededRemoteData()
);
const groupRD$ = this.groupService.findByHref(this.resourcePolicy._links.group.href, false).pipe(
getFirstSucceededRemoteData()
);
const dsoRD$: Observable<RemoteData<DSpaceObject>> = observableCombineLatest([epersonRD$, groupRD$]).pipe(
map((rdArr: RemoteData<DSpaceObject>[]) => {
return rdArr.find((rd: RemoteData<DSpaceObject>) => isNotEmpty(rd.payload));
}),
hasValueOperator(),
);
this.subs.push(
dsoRD$.pipe(
filter(() => this.isActive),
).subscribe((dsoRD: RemoteData<DSpaceObject>) => {
this.resourcePolicyGrant = dsoRD.payload;
this.navActiveId = String(dsoRD.payload.type);
this.resourcePolicyTargetName$.next(this.getResourcePolicyTargetName());
})
)
} else {
}
}
/**
@@ -202,19 +206,12 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
*/
private buildResourcePolicyForm(): DynamicFormControlModel[] {
const formModel: DynamicFormControlModel[] = [];
// TODO to be removed when https://github.com/DSpace/DSpace/issues/7812 will be implemented
const policyTypeConf = Object.assign({}, RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG, {
disabled: isNotEmpty(this.resourcePolicy)
});
// TODO to be removed when https://github.com/DSpace/DSpace/issues/7812 will be implemented
const actionConf = Object.assign({}, RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG, {
disabled: isNotEmpty(this.resourcePolicy)
});
formModel.push(
new DsDynamicInputModel(RESOURCE_POLICY_FORM_NAME_CONFIG),
new DsDynamicTextAreaModel(RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG),
new DynamicSelectModel(policyTypeConf),
new DynamicSelectModel(actionConf)
new DynamicSelectModel(RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG),
new DynamicSelectModel(RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG)
);
const startDateModel = new DynamicDatePickerModel(