From a3020275a263fced7cd17ebccf917e752ffcd8bb Mon Sep 17 00:00:00 2001 From: Artem Baskal Date: Fri, 17 Jan 2020 12:57:30 +0300 Subject: [PATCH] + client: add jsdocs with returning format of date format functions --- client/src/components/Logs/index.js | 4 ++-- client/src/helpers/helpers.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js index 940769ef..ebe058e8 100644 --- a/client/src/components/Logs/index.js +++ b/client/src/components/Logs/index.js @@ -116,12 +116,12 @@ class Logs extends Component { checkWhiteList = reason => reason === FILTERED_STATUS.NOT_FILTERED_WHITE_LIST; getTimeCell = ({ value }) => ( -
+
{formatTodayDate(value) === formatTodayDate(Date.now()) ? formatTime(value) : formatDateTime(value)} -
+
); getDomainCell = (row) => { diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js index 53a821f0..bda48e48 100644 --- a/client/src/helpers/helpers.js +++ b/client/src/helpers/helpers.js @@ -19,11 +19,19 @@ import { DNS_RECORD_TYPES, } from './constants'; +/** + * @param string The time to format + * @returns string Returns the time in the format HH:mm:ss + */ export const formatTime = (time) => { const parsedTime = dateParse(time); return dateFormat(parsedTime, 'HH:mm:ss'); }; +/** + * @param string The date to format + * @returns string Returns the date and time in the format DD/MM/YYYY, HH:mm + */ export const formatDateTime = (dateTime) => { const currentLanguage = i18n.languages[0] || 'en'; const parsedTime = dateParse(dateTime); @@ -39,6 +47,10 @@ export const formatDateTime = (dateTime) => { return parsedTime.toLocaleString(currentLanguage, options); }; +/** + * @param string The date to format + * @returns string Returns the date in the format DD/MM/YYYY + */ export const formatTodayDate = (dateTime) => { const currentLanguage = i18n.languages[0] || 'en'; const parsedTime = dateParse(dateTime);