From c1b29c3f23d86ce8daf3c04ceabd9677782658d0 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 12 Aug 2024 20:16:18 +0200 Subject: [PATCH] fix: add equal condition to number fields on bank rule --- packages/server/src/services/Banking/Rules/types.ts | 4 +++- .../Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx | 2 +- .../src/containers/Banking/Rules/RuleFormDialog/_utils.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/server/src/services/Banking/Rules/types.ts b/packages/server/src/services/Banking/Rules/types.ts index f13670db8..49e71abf5 100644 --- a/packages/server/src/services/Banking/Rules/types.ts +++ b/packages/server/src/services/Banking/Rules/types.ts @@ -65,8 +65,10 @@ export interface IBankRuleConditionDTO { | 'contains' | 'equals' | 'not_contains' - | 'smaller' + | 'equal' + | 'bigger' | 'bigger_or_equal' + | 'smaller' | 'smaller_or_equal'; value: number; } diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx index ee9820772..f3b172b7f 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx @@ -1,6 +1,7 @@ // @ts-nocheck import { useCallback, useMemo } from 'react'; import { Form, Formik, FormikHelpers, useFormikContext } from 'formik'; +import { get } from 'lodash'; import { Button, Classes, Intent, Radio, Tag } from '@blueprintjs/core'; import * as R from 'ramda'; import { CreateRuleFormSchema } from './RuleFormContentForm.schema'; @@ -34,7 +35,6 @@ import { import withDialogActions from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; import { getAddMoneyInOptions, getAddMoneyOutOptions } from '@/constants'; -import { get } from 'lodash'; // Retrieves the add money in button options. const MoneyInOptions = getAddMoneyInOptions(); diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/_utils.ts b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/_utils.ts index b3ca5b924..e68418d39 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/_utils.ts +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/_utils.ts @@ -49,6 +49,7 @@ export const TextFieldConditions = [ { value: 'not_contains', text: 'Not Contains' }, ]; export const NumberFieldConditions = [ + { value: 'equal', text: 'Equal' }, { value: 'bigger', text: 'Bigger' }, { value: 'bigger_or_equal', text: 'Bigger or Equal' }, { value: 'smaller', text: 'Smaller' },