From a701d4ceeccaf2fe305312d49a487cc621528819 Mon Sep 17 00:00:00 2001 From: Paul Adamsen <117673433+pauladamseniii@users.noreply.github.com> Date: Tue, 23 May 2023 09:30:08 -0400 Subject: [PATCH] CEC-4341 - Fix Can signal export select all (#340) * CEC-4341 - Fix Can signal export select all * fix code smell --- src/components/CANSelfServe/SelfServe/index.jsx | 10 ++++++---- src/components/Contexts/CANSignalsExportContext.jsx | 10 ++++++++-- src/services/CANSignalAPI.js | 7 +++---- src/services/__mocks__/CANSignalAPI.js | 8 ++++---- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/components/CANSelfServe/SelfServe/index.jsx b/src/components/CANSelfServe/SelfServe/index.jsx index 3de5740..d67a531 100644 --- a/src/components/CANSelfServe/SelfServe/index.jsx +++ b/src/components/CANSelfServe/SelfServe/index.jsx @@ -16,7 +16,7 @@ const MainForm = ({ id }) => { const [selectedStartDate, setSelectedStartDate] = useState(new Date(Date.now() - 24 * 60 * 60 * 1000)); const [selectedEndDate, setSelectedEndDate] = useState(new Date()); const [selectedCanSignals, setSelectedCanSignals] = useState([]); - + const [selectAllCanSignals, setSelectAllCanSignals] = useState(false); const { token: { @@ -29,8 +29,8 @@ const MainForm = ({ id }) => { let timestamp_start = Date.parse(selectedStartDate.toUTCString()) / 1000 let timestamp_end = Date.parse(selectedEndDate.toUTCString()) / 1000 try { - await getDynamicColumnCANSignals(id, timestamp_start, timestamp_end, selectedCanSignals, token) - } catch(e){ + await getDynamicColumnCANSignals(id, timestamp_start, timestamp_end, selectedCanSignals, selectAllCanSignals, token) + } catch (e) { setMessage(e.message); logger.error(e.stack) } @@ -74,12 +74,14 @@ const MainForm = ({ id }) => { const handleSelectedItemsChange = (event) => { const { value } = event.target; if (value.some(item => item === "Select All")) { + setSelectAllCanSignals(true); if (selectedCanSignals.length === canSignals.length) { setSelectedCanSignals([]); } else { setSelectedCanSignals(canSignals.map(signal => signal.signal_name)); } } else { + setSelectAllCanSignals(false); setSelectedCanSignals(value); } }; @@ -156,7 +158,7 @@ const MainForm = ({ id }) => { - Select CAN signals + Select CAN signals