From 19a0ff0f686fc4ac108fee15dc14427a11d5e374 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 11 Apr 2023 12:37:49 +0300 Subject: [PATCH] modify all validation reactions to prev commit style --- apps/web/process/bonuses/reactions/validation.ts | 5 +++-- apps/web/process/configurator/reactions/validation.ts | 5 +++-- apps/web/process/gibdd/reactions.ts | 4 +++- apps/web/process/insurance/reactions.ts | 5 ++++- apps/web/process/leasing-object/reactions/validation.ts | 5 +++-- apps/web/process/payments/reactions/validation.ts | 5 ++++- apps/web/process/price/reactions/validation.ts | 5 +++-- apps/web/process/supplier-agent/reactions/validation.ts | 4 +++- apps/web/process/used-pl/reactions.ts | 5 +++-- 9 files changed, 29 insertions(+), 14 deletions(-) diff --git a/apps/web/process/bonuses/reactions/validation.ts b/apps/web/process/bonuses/reactions/validation.ts index d8ff572..f01c3df 100644 --- a/apps/web/process/bonuses/reactions/validation.ts +++ b/apps/web/process/bonuses/reactions/validation.ts @@ -16,16 +16,17 @@ export default function reactions(context: ProcessContext) { reaction( () => $calculation.$values.getValues(['product', 'saleBonus']), async (values) => { - helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/configurator/reactions/validation.ts b/apps/web/process/configurator/reactions/validation.ts index 86a8dda..d719068 100644 --- a/apps/web/process/configurator/reactions/validation.ts +++ b/apps/web/process/configurator/reactions/validation.ts @@ -16,16 +16,17 @@ export default function reactions(context: ProcessContext) { reaction( () => $calculation.$values.getValues(['parmentsDecreasePercent', 'tarif']), async (values) => { - helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/gibdd/reactions.ts b/apps/web/process/gibdd/reactions.ts index 5888121..d258636 100644 --- a/apps/web/process/gibdd/reactions.ts +++ b/apps/web/process/gibdd/reactions.ts @@ -538,13 +538,15 @@ export function validation(context: ProcessContext) { validationHelper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) validationHelper.add(removeError); }); }); + } else { + validationHelper.removeErrors(); } }, { diff --git a/apps/web/process/insurance/reactions.ts b/apps/web/process/insurance/reactions.ts index 52f9a86..360c4f7 100644 --- a/apps/web/process/insurance/reactions.ts +++ b/apps/web/process/insurance/reactions.ts @@ -1,3 +1,4 @@ +/* eslint-disable sonarjs/cognitive-complexity */ import type { ProcessContext } from '../types'; import { createValidationSchema } from './validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; @@ -298,7 +299,7 @@ export function validation(context: ProcessContext) { helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Array).forEach((elementName) => { if (elementName === 'insurance') { @@ -310,6 +311,8 @@ export function validation(context: ProcessContext) { } }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/leasing-object/reactions/validation.ts b/apps/web/process/leasing-object/reactions/validation.ts index d83b8db..3e7f504 100644 --- a/apps/web/process/leasing-object/reactions/validation.ts +++ b/apps/web/process/leasing-object/reactions/validation.ts @@ -46,16 +46,17 @@ export default function reactions(context: ProcessContext) { 'leaseObjectCategory', ]), async (values) => { - helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/payments/reactions/validation.ts b/apps/web/process/payments/reactions/validation.ts index 7338325..61febeb 100644 --- a/apps/web/process/payments/reactions/validation.ts +++ b/apps/web/process/payments/reactions/validation.ts @@ -1,3 +1,4 @@ +/* eslint-disable sonarjs/cognitive-complexity */ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; @@ -34,7 +35,7 @@ export default function reactions(context: ProcessContext) { helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Array).forEach((elementName) => { if (elementName === 'payments') { @@ -46,6 +47,8 @@ export default function reactions(context: ProcessContext) { } }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/price/reactions/validation.ts b/apps/web/process/price/reactions/validation.ts index 236a9c5..be2ec4e 100644 --- a/apps/web/process/price/reactions/validation.ts +++ b/apps/web/process/price/reactions/validation.ts @@ -25,16 +25,17 @@ export default function reactions(context: ProcessContext) { 'subsidySum', ]), async (values) => { - helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/supplier-agent/reactions/validation.ts b/apps/web/process/supplier-agent/reactions/validation.ts index 234660c..4da1788 100644 --- a/apps/web/process/supplier-agent/reactions/validation.ts +++ b/apps/web/process/supplier-agent/reactions/validation.ts @@ -54,13 +54,15 @@ export default function reactions(context: ProcessContext) { helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, { diff --git a/apps/web/process/used-pl/reactions.ts b/apps/web/process/used-pl/reactions.ts index d0fcce3..854cc2d 100644 --- a/apps/web/process/used-pl/reactions.ts +++ b/apps/web/process/used-pl/reactions.ts @@ -259,16 +259,17 @@ export function validation(context: ProcessContext) { 'vin', ]), async (values) => { - helper.removeErrors(); const validationResult = await validationSchema.safeParseAsync(values); - if (!validationResult.success) { + if (validationResult.success === false) { validationResult.error.errors.forEach(({ path, message }) => { (path as Elements[]).forEach((elementName) => { const removeError = $calculation.element(elementName).setError({ key, message }); if (removeError) helper.add(removeError); }); }); + } else { + helper.removeErrors(); } }, {