diff --git a/src/components/TableFilters/TableFilters.tsx b/src/components/TableFilters/TableFilters.tsx index 14ea9044..abcc94c9 100644 --- a/src/components/TableFilters/TableFilters.tsx +++ b/src/components/TableFilters/TableFilters.tsx @@ -34,6 +34,7 @@ import DateTimePickerComponent from '@cp/src/components/DateTimePicker/DateTimeP import { DATE_TIME_TYPE } from '@cp/src/components/DateTimePicker/constants'; import { isFunction, isObjectEmpty } from '@cp/utils/commonUtils'; import { GenericObject } from '@cp/src/types/CommonConstans'; +import { DateFormat, dateFormat } from '@cp/src/utils/DateHelper'; const CLEAR_ALL_FILTERS_COUNT = 1; @@ -152,6 +153,12 @@ const TableFilters = ({ } else { selectedOptionFilterMap[filterKey] = option.value; } + if (filterKey === CaseFilter.assignedAtFilters) { + if (option.value !== 'select_date_range') { + setFromAssignedAt(option.fromDate); + setTillAssignedAt(option.tillDate); + } + } } else { selectedOptionFilterMap = removeSpecificOption( { ...selectedOptions }, @@ -288,7 +295,10 @@ const TableFilters = ({ tooltipLabel = selectedOptions?.map((option: any) => option?.label)?.join(', '); } else { if (filterKey === CaseFilter.assignedAtFilters) { - tooltipLabel = `${fromAssignedAt} - ${tillAssignedAt}`; + tooltipLabel = `${dateFormat( + new Date(fromAssignedAt), + DateFormat.LONG_DATE_FORMAT_WITHOUT_TIME + )} - ${dateFormat(new Date(tillAssignedAt), DateFormat.LONG_DATE_FORMAT_WITHOUT_TIME)}`; } else { tooltipLabel = selectedOptions?.label || ''; }