From 0f4350f99ce301469241235e6616c7901500f0a1 Mon Sep 17 00:00:00 2001 From: Mauricio Navarro Miranda Date: Fri, 11 Sep 2020 01:44:40 -0500 Subject: [PATCH] fix: wizard tables are not on edit mode by default --- new-lamassu-admin/src/components/editableTable/Table.js | 5 +++-- new-lamassu-admin/src/pages/Wizard/components/Commissions.js | 4 ++-- new-lamassu-admin/src/pages/Wizard/components/Locales.js | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/new-lamassu-admin/src/components/editableTable/Table.js b/new-lamassu-admin/src/components/editableTable/Table.js index 734b3b40..d9b62a7a 100644 --- a/new-lamassu-admin/src/components/editableTable/Table.js +++ b/new-lamassu-admin/src/components/editableTable/Table.js @@ -50,7 +50,8 @@ const ETable = ({ disableRowEdit, groupBy, sortBy, - createText = 'Add override' + createText = 'Add override', + outerEditingId = null }) => { const [editingId, setEditingId] = useState(null) const [adding, setAdding] = useState(false) @@ -87,7 +88,7 @@ const ETable = ({ const onReset = () => { setAdding(false) - setEditingId(null) + setEditingId(outerEditingId) setEditing && setEditing(false) } diff --git a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js b/new-lamassu-admin/src/pages/Wizard/components/Commissions.js index 43e7b4f5..298cbe41 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Commissions.js @@ -65,11 +65,11 @@ function Commissions({ dispatch, namespace }) { rowSize="lg" titleLg name="commissions" + outerEditingId={1} enableEdit - initialValues={values} save={save} validationSchema={schema} - data={R.of(values)} + data={R.of({ ...values, id: 1 })} elements={mainFields(currency)} /> diff --git a/new-lamassu-admin/src/pages/Wizard/components/Locales.js b/new-lamassu-admin/src/pages/Wizard/components/Locales.js index 892f5c61..0cf6c8c5 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Locales.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Locales.js @@ -86,11 +86,12 @@ function Locales({ dispatch, namespace }) { rowSize="lg" titleLg name="locale" - enableEdit initialValues={locale} + outerEditingId={1} + enableEdit save={save} validationSchema={schema} - data={R.of(locale)} + data={R.of({ ...locale, id: 1 })} elements={mainFields(data)} />