|
1 | 1 | import React, { useEffect, useState } from 'react';
|
2 | 2 | import { FunctionComponent } from 'react';
|
3 | 3 | import DownloadReportTable from '../download-report-table/download-report-table';
|
4 |
| -import { reportsTip, note, publishDate } from './reports-section.module.scss'; |
| 4 | +import { reportsTip, note } from './reports-section.module.scss'; |
5 | 5 | import DatasetSectionContainer from '../../dataset-section-container/dataset-section-container';
|
6 | 6 | import { getPublishedDates } from '../../../helpers/dataset-detail/report-helpers';
|
7 | 7 | import ReportDatePicker from '../report-date-picker/report-date-picker';
|
@@ -57,13 +57,16 @@ const ReportsSection: FunctionComponent<{ publishedReportsProp: IReports[]; data
|
57 | 57 |
|
58 | 58 | const updateReportSelection = (date, isDaily, sortedReports) => {
|
59 | 59 | if (date) {
|
60 |
| - const day = date.getDate(); |
61 |
| - const month = date.toLocaleString('default', { month: 'short' }); |
62 |
| - const year = date.getFullYear(); |
| 60 | + const selectedDay = date.getDate(); |
| 61 | + const selectedMonth = date.toLocaleString('default', { month: 'short' }); |
| 62 | + const selectedYear = date.getFullYear(); |
63 | 63 |
|
64 | 64 | const filteredReports = sortedReports.filter((report: IReports) => {
|
65 |
| - const dateStr = report.report_date.toString(); |
66 |
| - return dateStr.includes(month) && dateStr.includes(year) && ((isDaily && dateStr.includes(day)) || !isDaily); |
| 65 | + const reportDate = new Date(report.report_date); |
| 66 | + const reportDay = reportDate.getDate(); |
| 67 | + const reportMonth = reportDate.toLocaleString('default', { month: 'short' }); |
| 68 | + const reportYear = reportDate.getFullYear(); |
| 69 | + return selectedMonth === reportMonth && selectedYear === reportYear && ((isDaily && selectedDay === reportDay) || !isDaily); |
67 | 70 | });
|
68 | 71 | filteredReports.sort((a, b) => a.report_group_sort_order_nbr - b.report_group_sort_order_nbr);
|
69 | 72 | if (filteredReports.length > 0) {
|
|
0 commit comments