fix(webapp): remove year drop down on expense

edenia · Dec 28, 2022 · 4b4b505 · 4b4b505
1 parent e7c941e
commit 4b4b505
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 40 deletions.
diff --git a/webapp/src/hooks/customHooks/useExpenseReportState.js b/webapp/src/hooks/customHooks/useExpenseReportState.js
@@ -19,7 +19,6 @@ import {
 import { useImperativeQuery } from '../../utils'
 
 const useExpenseReportState = () => {
-  const [electionYearSelect, setElectionYearSelect] = useState('All')
   const [electionRoundSelect, setElectionRoundSelect] = useState(0)
   const [showElectionRadio, setShowElectionRadio] = useState('allElections')
   const [electionsByYearList, setElectionsByYearList] = useState([])
@@ -28,16 +27,6 @@ const useExpenseReportState = () => {
   const [categoryList, setCategoryList] = useState([])
   const [percentExpenseList, setPercentExpenseList] = useState([])
 
-  const getListElectionYears = () => {
-    const yearsList = ['All']
-    const yearCurrent = new Date().getFullYear()
-    for (let index = 2021; index <= yearCurrent; index++) {
-      yearsList.push(index)
-    }
-
-    return yearsList
-  }
-
   const loadExpenseByElections = useImperativeQuery(GET_EXPENSE_BY_ELECTIONS)
   const loadTotalExpenseByDelegate = useImperativeQuery(
     GET_TOTAL_EXPENSE_BY_DELEGATE
@@ -56,17 +45,10 @@ const useExpenseReportState = () => {
 
   useEffect(async () => {
     const expenseByElections = await loadExpenseByElections()
-    const electionsByYear = await loadElectionsByYear(
-      electionYearSelect === 'All' || electionYearSelect === 'Todos'
-        ? {
-            minDate: `2021-01-01`,
-            maxDate: `${new Date().getFullYear()}-12-31`
-          }
-        : {
-            minDate: `${electionYearSelect}-01-01`,
-            maxDate: `${electionYearSelect}-12-31`
-          }
-    )
+    const electionsByYear = await loadElectionsByYear({
+      minDate: `2021-01-01`,
+      maxDate: `${new Date().getFullYear()}-12-31`
+    })
 
     setExpenseByElectionsList(
       newDataFormatByCategorizedElectionsExpense(expenseByElections.data || [])
@@ -137,13 +119,10 @@ const useExpenseReportState = () => {
       delegatesList,
       categoryList,
       electionRoundSelect,
-      electionYearSelect,
       showElectionRadio
     },
     {
       setElectionRoundSelect,
-      setElectionYearSelect,
-      getListElectionYears,
       setShowElectionRadio
     }
   ]

diff --git a/webapp/src/routes/ExpenseReport/index.js b/webapp/src/routes/ExpenseReport/index.js
@@ -35,15 +35,9 @@ const ExpenseReport = () => {
       delegatesList,
       categoryList,
       electionRoundSelect,
-      electionYearSelect,
       showElectionRadio
     },
-    {
-      setElectionRoundSelect,
-      setElectionYearSelect,
-      getListElectionYears,
-      setShowElectionRadio
-    }
+    { setElectionRoundSelect, setShowElectionRadio }
   ] = useExpenseReportState()
 
   const tableData =
@@ -146,14 +140,6 @@ const ExpenseReport = () => {
         </div>
         {showElectionRadio === 'oneElection' && (
           <div id="id-radio-election-container">
-            <SelectComponent
-              onChangeFunction={setElectionYearSelect}
-              labelSelect={t('textYearSelect', { ns: 'generalForm' })}
-              values={getListElectionYears()}
-              actualValue={electionYearSelect}
-              width={100}
-              size="small"
-            />
             <SelectComponent
               onChangeFunction={setElectionRoundSelect}
               labelSelect={t('textElectionSelect', { ns: 'generalForm' })}