fix(LastSeenFilter): Fixes Validators and adds test

package.json

@@ -24,6 +24,7 @@
     "html-webpack-plugin": "^5.5.0",
     "lodash": "^4.17.21",
     "marked": "^4.0.10",
+    "moment": "^2.29.4",
     "p-all": "^4.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

src/api/api.js

@@ -196,8 +196,10 @@ export async function getEntities(items, {
                     ...(options.filter && Object.keys(options.filter).length && generateFilter(options.filter)),
                     ...(calculateSystemProfile(filters)),
                     ...(fields && Object.keys(fields).length && generateFilter(fields, 'fields')),
-                    ...filters?.lastSeenFilter?.updatedStart && { updated_start: filters.lastSeenFilter.updatedStart },
-                    ...filters?.lastSeenFilter?.updatedEnd && { updated_end: filters.lastSeenFilter.updatedEnd }
+                    ...filters?.lastSeenFilter?.updatedStart &&
+                     filters?.lastSeenFilter?.updatedStart.length > 0 && { updated_start: filters.lastSeenFilter.updatedStart },
+                    ...filters?.lastSeenFilter?.updatedEnd &&
+                     filters?.lastSeenFilter?.updatedEnd.length > 0 && { updated_end: filters.lastSeenFilter.updatedEnd }
                 }
             }
         )

src/components/InventoryTable/EntityTableToolbar.js

@@ -53,6 +53,7 @@ import useOperatingSystemFilter from '../filters/useOperatingSystemFilter';
 import useFeatureFlag from '../../Utilities/useFeatureFlag';
 import useGroupFilter from '../filters/useGroupFilter';
 import { DatePicker, Split, SplitItem } from '@patternfly/react-core';
+import { fromValidator, toValidator } from '../filters/helpers';
 
 /**
  * Table toolbar used at top of inventory table.
@@ -112,7 +113,7 @@ const EntityTableToolbar = ({
     const [registeredFilter, registeredChip, registeredWithFilter, setRegisteredWithFilter] = useRegisteredWithFilter(reducer);
     const [rhcdFilterConfig, rhcdFilterChips, rhcdFilterValue, setRhcdFilterValue] = useRhcdFilter(reducer);
     const [lastSeenFilter, lastSeenChip, lastSeenFilterValue, setLastSeenFilterValue,
-        toValidator, onFromChange, onToChange, endDate, startDate, fromValidator,
+        onFromChange, onToChange, endDate, startDate,
         setStartDate, setEndDate] = useLastSeenFilter(reducer);
     const [osFilterConfig, osFilterChips, osFilterValue, setOsFilterValue] = useOperatingSystemFilter();
     const [updateMethodConfig, updateMethodChips, updateMethodValue, setUpdateMethodValue] = useUpdateMethodFilter(reducer);
@@ -348,6 +349,8 @@ const EntityTableToolbar = ({
         enabledFilters.lastSeenFilter && setLastSeenFilterValue([]);
         enabledFilters.updateMethodFilter && setUpdateMethodValue([]);
         enabledFilters.hostGroupFilter && setHostGroupValue([]);
+        setEndDate();
+        setStartDate();
         dispatch(setFilter([]));
         updateData({ page: 1, filters: [] });
     };
@@ -444,7 +447,7 @@ const EntityTableToolbar = ({
                     <DatePicker
                         onChange={onFromChange}
                         aria-label="Start date"
-                        validators={[fromValidator]}
+                        validators={[fromValidator(endDate)]}
                         placeholder='Start'
                     />
                 </SplitItem>
@@ -455,8 +458,9 @@ const EntityTableToolbar = ({
                     <DatePicker
                         value={endDate}
                         onChange={onToChange}
-                        rangeStart={startDate}
-                        validators={[toValidator]}
+                        rangeStart={new Date(startDate)
+                        }
+                        validators={[toValidator(startDate)]}
                         aria-label="End date"
                         placeholder='End'
                     />

src/components/filters/helpers.js

@@ -0,0 +1,38 @@
+import moment from 'moment';
+
+export const oldestDate = new Date(1950, 1, 1);
+//validators control what date ranges can be selected in the component.
+//both validators need to keep in mind todays date, and the other components inputed date.
+
+//maxDate is the other date pickers currently selected Date
+//date is patternfly component date
+export const fromValidator = (maxDate) => (date) => {
+    const todaysDate = moment().startOf('day');
+    const newMaxDate = moment(maxDate).startOf('day');
+
+    if (date < oldestDate) {
+        return 'Date is before the allowable range.';
+    } else if (date > newMaxDate) {
+        return `End date must be later than Start date.`;
+    } else if (date > todaysDate) {
+        return ' Start date must be earlier than End date.';
+    } else {
+        return '';
+    }
+};
+
+//minDate is the other components currently selected Date
+//dateToValidate is patternfly component date.
+export const toValidator = (minDate) => (dateToValidate) => {
+    const todaysDate = moment().endOf('day');
+    const newDatetoValidate = new Date(dateToValidate);
+    const newMinDate = moment(minDate).startOf('day');
+
+    if (newDatetoValidate < newMinDate) {
+        return 'Start date must be earlier than End date.';
+    } else if (newDatetoValidate > todaysDate) {
+        return `Date must be ${todaysDate.toISOString().split('T')[0]} or earlier`;
+    } else {
+        return '';
+    }
+};

src/components/filters/helpers.test.js

@@ -0,0 +1,16 @@
+import { fromValidator, toValidator } from './helpers';
+import moment from 'moment';
+
+describe('Validates datepicker dates', () => {
+    it('ToValidator', () => {
+        const startOfToday = moment().startOf('day');
+        const endOfToday = moment().endOf('day');
+        expect(toValidator(startOfToday)(endOfToday)).toEqual('');
+    });
+    it('FromValidator', () => {
+        const  startOfToday = moment().startOf('day');
+        const   endOfToday = moment().endOf('day');
+        expect(fromValidator(endOfToday)(startOfToday)).toEqual('');
+
+    });
+});

src/components/filters/useLastSeenFilter.js

@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { LAST_SEEN_CHIP, lastSeenItems } from '../../Utilities/constants';
-
+import moment from 'moment';
+import { oldestDate } from './helpers.js';
 export const lastSeenFilterState = { lastSeenFilter: [] };
 export const LAST_SEEN_FILTER = 'LAST_SEEN_FILTER';
 export const lastSeenFilterReducer = (_state, { type, payload }) => ({
@@ -42,81 +43,74 @@ export const useLastSeenFilter = (
         ]
         : [];
 
-    const [startDate, setStartDate] = useState();
+    const [startDate, setStartDate] = useState(oldestDate);
     const [endDate, setEndDate] = useState();
-    const todaysDate = new Date();
+    const todaysDate = moment();
 
-    const manageStartDate = (apiStartDate, apiEndDate)=> {
-        if (isNaN(apiEndDate) &&  isNaN(apiStartDate)) {
+    const manageStartDate = (apiStartDate, apiEndDate) => {
+        const newApiStartDate = apiStartDate;
+        const newApiEndDate = apiEndDate;
+        if (isNaN(newApiEndDate) && isNaN(newApiStartDate)) {
             setValue({ ...lastSeenValue, updatedStart: null, updatedEnd: null });
-        } else if (apiStartDate > apiEndDate || isNaN(apiStartDate) || apiStartDate > todaysDate) {
-            setValue({ ...lastSeenValue, updatedStart: null, updatedEnd: apiEndDate.toISOString() });
-        } else {
-            setValue({ ...lastSeenValue, updatedStart: apiStartDate.toISOString() });
-        }
-    };
-
-    const manageEndDate = (apiStartDate, apiEndDate)=> {
-        if (isNaN(apiEndDate) &&  isNaN(apiStartDate)) {
-            setValue({ ...lastSeenValue, updatedStart: null, updatedEnd: null });
-        } else if (apiStartDate > apiEndDate || isNaN(apiEndDate)) {
-            setValue({ ...lastSeenValue, updatedStart: apiStartDate.toISOString(), updatedEnd: null });
-        } else {
-            setValue({ ...lastSeenValue, updatedEnd: apiEndDate.toISOString() });
-        }
-    };
-
-    const toValidator = (date) => {
-        const newDate = new Date(date);
-        const minDate = new Date(startDate);
-
-        if (minDate >= newDate) {
-            return 'Start date must be earlier than End date.';
-        } else if (newDate > todaysDate) {
-            return `Date must be ${todaysDate.toISOString().split('T')[0]} or earlier`;
+        } else if (
+            newApiStartDate > newApiEndDate ||
+      isNaN(newApiStartDate) ||
+      newApiStartDate > todaysDate
+        ) {
+            setValue({
+                ...lastSeenValue,
+                updatedStart: null,
+                updatedEnd: newApiEndDate
+            });
         } else {
-            return '';
+            setValue({
+                ...lastSeenValue,
+                updatedStart: `${newApiStartDate.format('YYYY-MM-DD')}T00:00:00.000Z`
+            });
         }
     };
 
-    const fromValidator = (date) => {
-        const minDate = new Date(1950, 1, 1);
-        const maxDate = new Date(endDate);
+    const manageEndDate = (apiStartDate, apiEndDate) => {
+        const newApiStartDate = apiStartDate.startOf('day');
+        const newApiEndDate = apiEndDate.endOf('day');
 
-        if (date < minDate) {
-            return 'Date is before the allowable range.';
-        } else if (date > maxDate) {
-            return `End date must be later than Start date.`;
-        } else if (date > todaysDate) {
-            return ' Start date must be earlier than End date.';
+        if (isNaN(newApiEndDate) && isNaN(newApiStartDate)) {
+            setValue({ ...lastSeenValue, updatedStart: null, updatedEnd: null });
+        } else if (newApiStartDate > newApiEndDate || isNaN(newApiEndDate)) {
+            setValue({
+                ...lastSeenValue,
+                updatedStart: newApiStartDate,
+                updatedEnd: null
+            });
         } else {
-            return '';
+            setValue({ ...lastSeenValue, updatedEnd: `${newApiEndDate.format('YYYY-MM-DD')}T23:59:00.000Z` });
         }
     };
 
+    //This date comes from patternfly component. This manages the 1st date picker
     const onFromChange = (date) => {
-        const newToDate = new Date(endDate);
+        const newToDate = moment(endDate).endOf('day');
         if (date > newToDate) {
             setStartDate();
             return 'End date must be later than Start date.';
         }
 
         setStartDate(date);
-        const apiStartDate = new Date(date);
-        apiStartDate.setUTCHours(0);
+        const apiStartDate = moment(date).startOf('day');
+
         manageStartDate(apiStartDate, newToDate);
     };
 
+    //This date comes from patternfly component. This manages the 2nd date picker
     const onToChange = (date) => {
-        if (startDate > new Date(date)) {
+        if (startDate > moment(date)) {
             return 'Start date must be earlier than End date.';
-        } else if (new Date(date) > todaysDate) {
+        } else if (moment(date) > todaysDate) {
             return 'End date must be later than Start date.';
         } else {
             setEndDate(date);
-            const apiEndDate = new Date(date);
-            apiEndDate.setUTCHours(23, 59);
-            manageEndDate(new Date(startDate), apiEndDate);
+            const apiEndDate = moment(date).endOf('day');
+            manageEndDate(moment(startDate), apiEndDate);
         }
     };
 
@@ -125,12 +119,10 @@ export const useLastSeenFilter = (
         chip,
         lastSeenValue,
         setValue,
-        toValidator,
         onFromChange,
         onToChange,
         endDate,
         startDate,
-        fromValidator,
         setStartDate,
         setEndDate
     ];