From bb6281b2ffe6418d0349557ccbcd9c75d9453fda Mon Sep 17 00:00:00 2001 From: Nicolas Rod <Nicolas.Rod@unige.ch> Date: Fri, 12 Mar 2021 19:09:22 +0100 Subject: [PATCH 1/2] fix(DepositDetailRoutable): correctly manage approval dialog cancel --- .../routables/deposit-detail/deposit-detail.routable.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts index 9bbf8d0da..433414758 100644 --- a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts +++ b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts @@ -507,7 +507,7 @@ export class DepositDetailRoutable extends AbstractRoutable implements OnInit, O }).afterClosed().pipe( take(1), tap((message: string | boolean | undefined) => { - if (isNullOrUndefined(confirm) || isFalse(confirm)) { + if (isNullOrUndefined(message) || isFalse(message)) { return; } this._store.dispatch(new DepositAction.Submit(deposit.resId)); -- GitLab From 2e5139536519b23b92585fc9980d4d20d7417ae6 Mon Sep 17 00:00:00 2001 From: Nicolas Rod <Nicolas.Rod@unige.ch> Date: Tue, 16 Mar 2021 11:43:20 +0100 Subject: [PATCH 2/2] fix(DepositAction): set correct type values in SubmitSuccess and SubmitFail classes --- src/app/features/deposit/stores/deposit.action.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/features/deposit/stores/deposit.action.ts b/src/app/features/deposit/stores/deposit.action.ts index dcb88e8f1..d7de34c5a 100644 --- a/src/app/features/deposit/stores/deposit.action.ts +++ b/src/app/features/deposit/stores/deposit.action.ts @@ -217,11 +217,11 @@ export namespace DepositAction { } export class SubmitSuccess extends BaseSubAction<Submit> { - static readonly type: string = `[${state}] Submit`; + static readonly type: string = `[${state}] Submit Success`; } export class SubmitFail extends BaseSubAction<Submit> { - static readonly type: string = `[${state}] Submit`; + static readonly type: string = `[${state}] Submit Fail`; } export class Transfer extends BaseAction { -- GitLab