Skip to content

Commit 5919829

Browse files
authored
Merge pull request #117 from zenml-io/QA-Fixes
fixed date format
2 parents c604ca9 + 199bdbd commit 5919829

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/ui/components/Filters/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Paragraph,
1010
} from '../../components';
1111
import { iconColors, iconSizes } from '../../../constants';
12-
import { formatDateToDisplay } from '../../../utils';
12+
import { formatDateToDisplayWithoutTime } from '../../../utils';
1313
import DatePicker from 'react-datepicker';
1414

1515
import 'bootstrap/dist/css/bootstrap.min.css';
@@ -813,7 +813,7 @@ const FilterComponent = ({
813813
filter.column.selectedValue.label,
814814
filter.filterValue,
815815
)
816-
: formatDateToDisplay(filter.filterValue)
816+
: formatDateToDisplayWithoutTime(filter.filterValue)
817817
}`}
818818
</Box>
819819

src/utils/date.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,29 @@ import {
55
addSeconds,
66
differenceInDays,
77
} from 'date-fns';
8-
import moment from 'moment'
8+
import moment from 'moment';
99

1010
const UTCformatter = (preDate: any) => moment.utc(preDate).toDate();
11-
const dateformat = (date: any) => moment(UTCformatter(date)).local().format('YYYY-MM-DD HH:mm:ss');
11+
const dateformat = (date: any) =>
12+
moment(UTCformatter(date)).local().format('YYYY-MM-DD HH:mm:ss');
1213

1314
const formatDateToFormat = (dateString: any, dateFormat: string): string =>
1415
format(new Date(dateString), dateFormat);
15-
// , { locale: deLocale }
16+
// , { locale: deLocale }
1617

1718
export const formatDateToDisplay = (dateString: Date): string => {
18-
if (typeof dateString === 'undefined' || !dateString) return '';
19-
return formatDateToFormat(dateformat(dateString), `dd.MM.yyyy HH:mm:ss`);
20-
};
19+
if (typeof dateString === 'undefined' || !dateString) return '';
20+
return formatDateToFormat(dateformat(dateString), `dd.MM.yyyy HH:mm:ss`);
21+
};
2122

2223
export const formatDateToDisplayOnTable = (dateString: any): any => {
2324
if (typeof dateString === 'undefined' || !dateString) return '';
2425
return formatDateToFormat(dateformat(dateString), `dd.MM.yyyy HH:mm:ss`);
2526
};
26-
27+
export const formatDateToDisplayWithoutTime = (dateString: Date): string => {
28+
if (typeof dateString === 'undefined' || !dateString) return '';
29+
return formatDateToFormat(dateformat(dateString), `MM/dd/yyyy`);
30+
};
2731
// export const formatDateToDisplay = (dateString: Date): string => {
2832
// if (typeof dateString === 'undefined' || !dateString) return '';
2933
// return formatDateToFormat(dateString, `dd.MM.yyyy`);

0 commit comments

Comments
 (0)