From 925d76dc4bf54da0ebf59dae5d7b8cafaad9ae7c Mon Sep 17 00:00:00 2001 From: Liordino Neto Date: Mon, 17 Aug 2020 22:51:03 -0300 Subject: [PATCH] fix: filter already overriden machines on locales --- new-lamassu-admin/src/pages/Locales/Locales.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Locales/Locales.js b/new-lamassu-admin/src/pages/Locales/Locales.js index cab9cef2..a2fb75a4 100644 --- a/new-lamassu-admin/src/pages/Locales/Locales.js +++ b/new-lamassu-admin/src/pages/Locales/Locales.js @@ -69,6 +69,18 @@ const Locales = ({ name: SCREEN_KEY }) => { return saveConfig({ variables: { config } }) } + const removeOverridenMachines = data => { + if (data) { + const overridenMachines = locale.overrides?.map(o => o.machine) + const machinesIndex = data.findIndex(o => o.name === 'machine') + data[machinesIndex].inputProps.options = data[ + machinesIndex + ].inputProps.options?.filter(m => !overridenMachines.includes(m.deviceId)) + } + + return data + } + return ( <> @@ -97,7 +109,7 @@ const Locales = ({ name: SCREEN_KEY }) => { save={saveOverrides} validationSchema={OverridesSchema} data={locale.overrides ?? []} - elements={overrides(data)} + elements={removeOverridenMachines(overrides(data))} />