From a69da7ab1c255677c9489fe560e76bdfaa6f4f3f Mon Sep 17 00:00:00 2001 From: Maxim Stykow Date: Fri, 17 May 2024 17:59:17 +0200 Subject: [PATCH] fix: discard-and-proceed not working when creating new attribution - adjust check setting the selected attribution to distinguish between null and empty string Fixes #2635 Signed-off-by: Maxim Stykow --- .../state/actions/resource-actions/navigation-actions.ts | 4 ++-- src/e2e-tests/__tests__/updating-attributions.test.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Frontend/state/actions/resource-actions/navigation-actions.ts b/src/Frontend/state/actions/resource-actions/navigation-actions.ts index 69769c93a..524cc447a 100644 --- a/src/Frontend/state/actions/resource-actions/navigation-actions.ts +++ b/src/Frontend/state/actions/resource-actions/navigation-actions.ts @@ -36,12 +36,12 @@ export function setSelectedResourceOrAttributionIdToTargetValue(): AppThunkActio const targetSelectedAttributionId = getTargetSelectedAttributionId(getState()); - if (targetSelectedResourceId) { + if (targetSelectedResourceId !== null) { dispatch(setSelectedResourceId(targetSelectedResourceId)); dispatch(setTargetSelectedResourceId(null)); } - if (targetSelectedAttributionId) { + if (targetSelectedAttributionId !== null) { dispatch(setSelectedAttributionId(targetSelectedAttributionId)); dispatch(setTargetSelectedAttributionId(null)); } diff --git a/src/e2e-tests/__tests__/updating-attributions.test.ts b/src/e2e-tests/__tests__/updating-attributions.test.ts index 93bc92228..3c1fe1828 100644 --- a/src/e2e-tests/__tests__/updating-attributions.test.ts +++ b/src/e2e-tests/__tests__/updating-attributions.test.ts @@ -97,9 +97,7 @@ test('warns user of unsaved changes if user attempts to navigate away before sav await notSavedPopup.assert.isVisible(); await notSavedPopup.discardButton.click(); - await attributionDetails.attributionForm.assert.matchesPackageInfo( - packageInfo1, - ); + await attributionDetails.attributionForm.assert.isEmpty(); await attributionDetails.attributionForm.comment.fill( faker.lorem.sentences(),