From 797596dc45331eff5b02c0101174ab7e22374471 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 19 Feb 2021 10:46:39 +0100 Subject: [PATCH] [CST-3782] Fix issue with merge --- .../dynamic-lookup-relation-modal.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index 474a3376c4..c7474cb769 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -11,7 +11,11 @@ import { ListableObject } from '../../../../object-collection/shared/listable-ob import { RelationshipOptions } from '../../models/relationship-options.model'; import { SearchResult } from '../../../../search/search-result.model'; import { Item } from '../../../../../core/shared/item.model'; -import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; +import { + getAllSucceededRemoteData, + getAllSucceededRemoteDataPayload, + getRemoteDataPayload +} from '../../../../../core/shared/operators'; import { AddRelationshipAction, RemoveRelationshipAction, UpdateRelationshipNameVariantAction } from './relationship.actions'; import { RelationshipService } from '../../../../../core/data/relationship.service'; import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service'; @@ -28,6 +32,7 @@ import { SubmissionObject } from '../../../../../core/submission/models/submissi import { Collection } from '../../../../../core/shared/collection.model'; import { SubmissionService } from '../../../../../submission/submission.service'; import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service'; +import { RemoteData } from '../../../../../core/data/remote-data'; @Component({ selector: 'ds-dynamic-lookup-relation-modal',