From b159cd2409f0fa065014be53a7f89ed2ff137800 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Tue, 1 Dec 2020 19:07:28 +0200 Subject: [PATCH] fix: active checkbox in manual journal. --- client/src/containers/Items/ItemForm.js | 2 +- client/src/containers/Items/ItemForm.schema.js | 1 + client/src/containers/Items/ItemFormFloatingActions.js | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js index 167ec4f12..67ed8446c 100644 --- a/client/src/containers/Items/ItemForm.js +++ b/client/src/containers/Items/ItemForm.js @@ -30,7 +30,7 @@ import { } from './ItemForm.schema'; const defaultInitialValues = { - active: true, + active: 1, name: '', type: 'service', code: '', diff --git a/client/src/containers/Items/ItemForm.schema.js b/client/src/containers/Items/ItemForm.schema.js index 0046d403f..76c0d09ad 100644 --- a/client/src/containers/Items/ItemForm.schema.js +++ b/client/src/containers/Items/ItemForm.schema.js @@ -64,6 +64,7 @@ export const transformItemFormData = (item, defaultValue) => { ...item, sellable: !!defaultTo(item?.sellable, defaultValue.sellable), purchasable: !!defaultTo(item?.purchasable, defaultValue.purchasable), + active: !!defaultTo(item?.active, defaultValue.active), }; } diff --git a/client/src/containers/Items/ItemFormFloatingActions.js b/client/src/containers/Items/ItemFormFloatingActions.js index 3005133df..e6a60ad47 100644 --- a/client/src/containers/Items/ItemFormFloatingActions.js +++ b/client/src/containers/Items/ItemFormFloatingActions.js @@ -6,7 +6,6 @@ import classNames from 'classnames'; import { FastField } from 'formik'; import { CLASSES } from 'common/classes'; - /** * Item form floating actions. */ @@ -56,13 +55,13 @@ export default function ItemFormFloatingActions({ {/*----------- Active ----------*/} - {({ form, field, field: { value } }) => ( + {({ field }) => ( } - checked={value} - onChange={() => form.setFieldValue('active', !value)} + name={'active'} + {...field} /> )}