From 93b5a81869e40ec38e572d4e90646b8258e7c6b5 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 28 Feb 2019 13:11:01 -0700 Subject: [PATCH] SHIBUI Fixed issue with removing drafts --- .../resolver/effect/draft-collection.effects.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts index 6db7c2ffe..41c21aae3 100644 --- a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts +++ b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts @@ -104,11 +104,15 @@ export class DraftCollectionEffects { removeDraft$ = this.actions$.pipe( ofType(DraftActionTypes.REMOVE_DRAFT), map(getPayload), - switchMap(provider => this.draftService.find(provider.id, 'id').pipe( + switchMap(provider => { + let hasEntityId = !!provider.entityId; + let prop = hasEntityId ? 'entityId' : 'id'; + let val = hasEntityId ? provider.entityId : provider.id; + return this.draftService.find(val, prop).pipe( switchMap(selected => this.draftService.remove(selected)), map(p => new actions.RemoveDraftSuccess(p)) - ) - ) + ); + }) ); @Effect() removeDraftSuccessReload$ = this.actions$.pipe(