diff --git a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js index 6112133a..6d74548f 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js @@ -61,6 +61,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [meterList, setMeterList] = useState([]); + const [startfilteredMeterList, setstartFilteredMeterList] = useState([]); const [filteredMeterList, setFilteredMeterList] = useState([]); const [selectedMeter, setSelectedMeter] = useState(undefined); const [comparisonType, setComparisonType] = useState('month-on-month'); @@ -156,6 +157,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { console.log(json); setMeterList(json[0]); setFilteredMeterList(json[0]); + setstartFilteredMeterList(json[0]); if (json[0].length > 0) { setSelectedMeter(json[0][0].value); // enable submit button @@ -229,7 +231,11 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { const filteredResult = meterList.filter( meter => meter.label.toLowerCase().includes(keyword) ); - setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (keyword.length == 0){ + setFilteredMeterList(startfilteredMeterList); + }else { + setFilteredMeterList(keyword.length ? filteredResult : meterList); + } if (filteredResult.length > 0) { setSelectedMeter(filteredResult[0].value); // enable submit button diff --git a/myems-web/src/components/MyEMS/Meter/MeterCost.js b/myems-web/src/components/MyEMS/Meter/MeterCost.js index 7fd5c795..3e16c8ea 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCost.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCost.js @@ -61,6 +61,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [meterList, setMeterList] = useState([]); + const [startfilteredMeterList, setstartFilteredMeterList] = useState([]); const [filteredMeterList, setFilteredMeterList] = useState([]); const [selectedMeter, setSelectedMeter] = useState(undefined); const [comparisonType, setComparisonType] = useState('month-on-month'); @@ -156,6 +157,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { console.log(json); setMeterList(json[0]); setFilteredMeterList(json[0]); + setstartFilteredMeterList(json[0]); if (json[0].length > 0) { setSelectedMeter(json[0][0].value); // enable submit button @@ -229,7 +231,11 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { const filteredResult = meterList.filter( meter => meter.label.toLowerCase().includes(keyword) ); - setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (keyword.length == 0){ + setFilteredMeterList(startfilteredMeterList); + }else { + setFilteredMeterList(keyword.length ? filteredResult : meterList); + } if (filteredResult.length > 0) { setSelectedMeter(filteredResult[0].value); // enable submit button diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js index f588885b..21332878 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js @@ -61,6 +61,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [meterList, setMeterList] = useState([]); + const [startfilteredMeterList, setstartFilteredMeterList] = useState([]); const [filteredMeterList, setFilteredMeterList] = useState([]); const [selectedMeter, setSelectedMeter] = useState(undefined); const [comparisonType, setComparisonType] = useState('month-on-month'); @@ -156,6 +157,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { console.log(json); setMeterList(json[0]); setFilteredMeterList(json[0]); + setstartFilteredMeterList(json[0]); if (json[0].length > 0) { setSelectedMeter(json[0][0].value); // enable submit button @@ -231,7 +233,11 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { const filteredResult = meterList.filter( meter => meter.label.toLowerCase().includes(keyword) ); - setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (keyword.length == 0){ + setFilteredMeterList(startfilteredMeterList); + }else { + setFilteredMeterList(keyword.length ? filteredResult : meterList); + } if (filteredResult.length > 0) { setSelectedMeter(filteredResult[0].value); // enable submit button diff --git a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index f57fb968..d0a5e9b7 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -59,6 +59,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [meterList, setMeterList] = useState([]); + const [startfilteredMeterList, setstartFilteredMeterList] = useState([]); const [filteredMeterList, setFilteredMeterList] = useState([]); const [selectedMeter, setSelectedMeter] = useState(undefined); const [periodType, setPeriodType] = useState('daily'); @@ -151,6 +152,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { console.log(json); setMeterList(json[0]); setFilteredMeterList(json[0]); + setstartFilteredMeterList(json[0]); if (json[0].length > 0) { setSelectedMeter(json[0][0].value); // enable submit button @@ -226,7 +228,11 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { const filteredResult = meterList.filter( meter => meter.label.toLowerCase().includes(keyword) ); - setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (keyword.length == 0){ + setFilteredMeterList(startfilteredMeterList); + }else { + setFilteredMeterList(keyword.length ? filteredResult : meterList); + } if (filteredResult.length > 0) { setSelectedMeter(filteredResult[0].value); // enable submit button diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js index 127806b5..c851e3e4 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js +++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js @@ -56,6 +56,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [meterList, setMeterList] = useState([]); + const [startfilteredMeterList, setstartFilteredMeterList] = useState([]); const [filteredMeterList, setFilteredMeterList] = useState([]); const [selectedMeter, setSelectedMeter] = useState(undefined); const [cascaderOptions, setCascaderOptions] = useState(undefined); @@ -141,6 +142,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { console.log(json); setMeterList(json[0]); setFilteredMeterList(json[0]); + setstartFilteredMeterList(json[0]); if (json[0].length > 0) { setSelectedMeter(json[0][0].value); // enable submit button @@ -216,7 +218,11 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { const filteredResult = meterList.filter( meter => meter.label.toLowerCase().includes(keyword) ); - setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (keyword.length == 0){ + setFilteredMeterList(startfilteredMeterList); + }else { + setFilteredMeterList(keyword.length ? filteredResult : meterList); + } if (filteredResult.length > 0) { setSelectedMeter(filteredResult[0].value); // enable submit button