From bcb8c7872a419611d6bbddf5436b84d4e5667521 Mon Sep 17 00:00:00 2001 From: vashjs Date: Tue, 28 Jan 2025 16:17:16 +0100 Subject: [PATCH] refactor variables names --- .../BulkEditMarcLayer/BulkEditMarcLayer.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/BulkEditPane/BulkEditMarcLayer/BulkEditMarcLayer.js b/src/components/BulkEditPane/BulkEditMarcLayer/BulkEditMarcLayer.js index 46068cfc..cc629765 100644 --- a/src/components/BulkEditPane/BulkEditMarcLayer/BulkEditMarcLayer.js +++ b/src/components/BulkEditPane/BulkEditMarcLayer/BulkEditMarcLayer.js @@ -54,13 +54,15 @@ export const BulkEditMarcLayer = ({ const isMarcFormValid = isMarcContentUpdatesFormValid(marcFormErrors); const isAdministrativeFormValid = isContentUpdatesFormValid(contentUpdates); - const isAdministrativeFormPristine = !isEqual(ADMINISTRATIVE_FORM_INITIAL_STATE, contentUpdates); - const isMarcFormPristine = !isEqual(MARC_FORM_INITIAL_STATE, marcContentUpdatesWithoutId); + const isAdministrativeFormPristine = isEqual(ADMINISTRATIVE_FORM_INITIAL_STATE, contentUpdates); + const isMarcFormPristine = isEqual(MARC_FORM_INITIAL_STATE, marcContentUpdatesWithoutId); - // state is valid if at least one form is filled and valid and another one is not pristine or both forms are filled and valid - const areFormsStateValid = (isAdministrativeFormValid && !isMarcFormPristine) - || (isMarcFormValid && !isAdministrativeFormPristine) - || (isAdministrativeFormValid && isMarcFormValid); + const areBothFormsValid = isAdministrativeFormValid && isMarcFormValid; + const isOnlyAdministrativeValid = isAdministrativeFormValid && isMarcFormPristine; + const isOnlyMarcFormValid = isMarcFormValid && isAdministrativeFormPristine; + + // If at least one form is valid, we can confirm changes + const areFormsStateValid = isOnlyAdministrativeValid || isOnlyMarcFormValid || areBothFormsValid; const { isPreviewModalOpened,