Merge pull request #2302 from objectcomputing/feature-2297-anniversaries-query-parameters

added use of useQueryParameters in AnniversaryReportPage.jsx

Author: mvolkmann

web-ui/src/pages/AnniversaryReportPage.jsx

@@ -13,33 +13,47 @@ import SearchBirthdayAnniversaryResults from '../components/search-results/Searc
 import { sortAnniversaries } from '../context/util';
 
 import { selectCsrfToken } from '../context/selectors';
+import { useQueryParameters } from '../helpers/query-parameters';
 
 const months = [
-  { month: 'January' },
-  { month: 'February' },
-  { month: 'March' },
-  { month: 'April' },
-  { month: 'May' },
-  { month: 'June' },
-  { month: 'July' },
-  { month: 'August' },
-  { month: 'September' },
-  { month: 'October' },
-  { month: 'November' },
-  { month: 'December' }
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December'
 ];
 
 const AnniversaryReportPage = () => {
+  const currentMonth = new Date().getMonth();
+  const defaultMonths = [months[currentMonth]];
+
   const { state } = useContext(AppContext);
   const csrf = selectCsrfToken(state);
   const [searchAnniversaryResults, setSearchAnniversaryResults] = useState([]);
-  const currentMonth = new Date().getMonth();
-  const [selectedMonths, setSelectedMonths] = useState([months[currentMonth]]);
+  const [selectedMonths, setSelectedMonths] = useState(defaultMonths);
   const [hasSearched, setHasSearched] = useState(false);
 
+  useQueryParameters([
+    {
+      name: 'months',
+      default: defaultMonths,
+      value: selectedMonths,
+      setter: setSelectedMonths,
+      toQP(value) {
+        return value ? value.join(',') : [];
+      }
+    }
+  ]);
+
   const handleSearch = async monthsToSearch => {
-    const months = monthsToSearch.map(m => m.month);
-    const anniversaryResults = await getAnniversaries(months, csrf);
+    const anniversaryResults = await getAnniversaries(monthsToSearch, csrf);
     setSearchAnniversaryResults(sortAnniversaries(anniversaryResults));
     setHasSearched(true);
   };
@@ -55,13 +69,12 @@ const AnniversaryReportPage = () => {
           multiple
           id="monthSelect"
           options={months}
-          defaultValue={[months[currentMonth].month]}
+          defaultValue={defaultMonths}
           value={selectedMonths}
           onChange={onMonthChange}
           isOptionEqualToValue={(option, value) => {
-            return value ? value.month === option.month : false;
+            return value ? value === option : false;
           }}
-          getOptionLabel={option => option.month}
           renderInput={params => (
             <TextField
               {...params}