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

Merge branch 'followlink-refactor' into metadata-and-relationships-combined-in-submission

Browse Source
This commit is contained in:
Art Lowel
2020-02-24 14:59:28 +01:00
parent 9d059e190e f52c1d0ba5
commit bc8bacab54
347 changed files with 5892 additions and 4780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
View File

@@ -99,6 +99,7 @@ import { MetadataValue } from '../../../../core/shared/metadata.models';
import { FormService } from '../../form.service';
import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
import { SubmissionService } from '../../../../submission/submission.service';
import { followLink } from '../../../utils/follow-link-config.model';
export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
switch (model.type) {
@@ -241,7 +242,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
this.setItem();
this.value = Object.assign(new MetadataValue(), this.model.value);
if (hasValue(this.value) && this.value.isVirtual) {
const relationship$ = this.relationshipService.findById(this.value.virtualValue)
const relationship$ = this.relationshipService.findById(this.value.virtualValue, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType'))
.pipe(
getAllSucceededRemoteData(),
getRemoteDataPayload());
@@ -357,7 +358,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
private setItem() {
const submissionObject$ = this.submissionObjectService
.findById(this.model.submissionId).pipe(
.findById(this.model.submissionId, followLink('item'), followLink('collection')).pipe(
getAllSucceededRemoteData(),
getRemoteDataPayload()
);