From 0511a96a69d28300a63caa54e48d8b3d12ad109b Mon Sep 17 00:00:00 2001 From: Fosten Date: Thu, 27 Jun 2024 12:27:26 -0400 Subject: [PATCH] Clean up Sidebar vars and headings --- src/components/Blocks/PlantLogs/Sidebar.jsx | 14 +++++++------- src/components/Blocks/PlantLogs/plant_type.js | 10 +++++----- src/components/Blocks/PlantType/Sidebar.jsx | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/Blocks/PlantLogs/Sidebar.jsx b/src/components/Blocks/PlantLogs/Sidebar.jsx index c32ffd4..abcf7ca 100644 --- a/src/components/Blocks/PlantLogs/Sidebar.jsx +++ b/src/components/Blocks/PlantLogs/Sidebar.jsx @@ -20,14 +20,14 @@ const Sidebar = (props) => { ['log--transplanting', 'log--transplanting'], ]; - const value = WholePlantTypeResponse(props); - var newarray = value[0]; - var isAxiosBusy = value[1]; + const valueP = WholePlantTypeResponse(props); + var plantTypearray = valueP[0]; + var isPlantTypeBusy = valueP[1]; const valueL = WholeLandTypeResponse(props); var landTypearray = valueL[0]; var isLandTypeBusy = valueL[1]; - return isAxiosBusy || isLandTypeBusy ? ( + return isPlantTypeBusy || isLandTypeBusy ? (
Loading...
) : ( @@ -52,7 +52,7 @@ const Sidebar = (props) => { title="Plant Types" required={false} value={data.plant_type_selector ?? ''} - choices={newarray} + choices={plantTypearray} onChange={(name, value) => { onChangeBlock(block, { ...data, @@ -74,7 +74,7 @@ const Sidebar = (props) => { }} />
-

Select Status/Date filter

+

Select Status/Date Filters

{ }} />
-

Select sort

+

Select Sort

{ - const [newarray, setState2] = useState({}); - const [isAxiosBusy, setAxiosBusy] = useState(true); + const [plantTypearray, setState2] = useState({}); + const [isPlantTypeBusy, setAxiosBusy] = useState(true); useEffect(() => { async function myResponse2(url, combodata) { @@ -26,8 +26,8 @@ const WholePlantTypeResponse = (props) => { arr.push(ok2); arr.push(ok); } - const newarray = combineTwo(arr); - setState2(newarray); + const plantTypearray = combineTwo(arr); + setState2(plantTypearray); } catch (err) { // eslint-disable-next-line no-console console.log(err); @@ -37,7 +37,7 @@ const WholePlantTypeResponse = (props) => { } myResponse2(`${window.env.RAZZLE_FARMOS_API_HOST}/api/taxonomy_term/plant_type?sort=name`); }, []); - return [newarray, isAxiosBusy]; + return [plantTypearray, isPlantTypeBusy]; }; export default WholePlantTypeResponse; diff --git a/src/components/Blocks/PlantType/Sidebar.jsx b/src/components/Blocks/PlantType/Sidebar.jsx index b5ff10e..c0c5a52 100644 --- a/src/components/Blocks/PlantType/Sidebar.jsx +++ b/src/components/Blocks/PlantType/Sidebar.jsx @@ -90,7 +90,7 @@ const Sidebar = (props) => {