feat: Move timeMixin to a helper (#9799)
# Pull Request Template ## Description This PR will replace the usage of `timeMixin` with `timeHelper` Fixes https://linear.app/chatwoot/issue/CW-3451/move-time-mixin-to-a-helper ## Type of change - [x] New feature (non-breaking change which adds functionality) ## How Has This Been Tested? Please refer to this issue description. https://linear.app/chatwoot/issue/CW-3451/move-time-mixin-to-a-helper ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Sojan Jose <sojan@pepalo.com>
This commit is contained in:
92
app/javascript/shared/helpers/specs/timeHelper.spec.js
Normal file
92
app/javascript/shared/helpers/specs/timeHelper.spec.js
Normal file
@@ -0,0 +1,92 @@
|
||||
import {
|
||||
messageStamp,
|
||||
messageTimestamp,
|
||||
dynamicTime,
|
||||
dateFormat,
|
||||
shortTimestamp,
|
||||
} from 'shared/helpers/timeHelper';
|
||||
|
||||
beforeEach(() => {
|
||||
process.env.TZ = 'UTC';
|
||||
vi.useFakeTimers('modern');
|
||||
const mockDate = new Date(Date.UTC(2023, 4, 5));
|
||||
vi.setSystemTime(mockDate);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
describe('#messageStamp', () => {
|
||||
it('returns correct value', () => {
|
||||
expect(messageStamp(1612971343)).toEqual('3:35 PM');
|
||||
expect(messageStamp(1612971343, 'LLL d, h:mm a')).toEqual(
|
||||
'Feb 10, 3:35 PM'
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#messageTimestamp', () => {
|
||||
it('should return the message date in the specified format if the message was sent in the current year', () => {
|
||||
expect(messageTimestamp(1680777464)).toEqual('Apr 6, 2023');
|
||||
});
|
||||
it('should return the message date and time in a different format if the message was sent in a different year', () => {
|
||||
expect(messageTimestamp(1612971343)).toEqual('Feb 10 2021, 3:35 PM');
|
||||
});
|
||||
});
|
||||
|
||||
describe('#dynamicTime', () => {
|
||||
it('returns correct value', () => {
|
||||
Date.now = vi.fn(() => new Date(Date.UTC(2023, 1, 14)).valueOf());
|
||||
expect(dynamicTime(1612971343)).toEqual('about 2 years ago');
|
||||
});
|
||||
});
|
||||
|
||||
describe('#dateFormat', () => {
|
||||
it('returns correct value', () => {
|
||||
expect(dateFormat(1612971343)).toEqual('Feb 10, 2021');
|
||||
expect(dateFormat(1612971343, 'LLL d, yyyy')).toEqual('Feb 10, 2021');
|
||||
});
|
||||
});
|
||||
|
||||
describe('#shortTimestamp', () => {
|
||||
// Test cases when withAgo is false or not provided
|
||||
it('returns correct value without ago', () => {
|
||||
expect(shortTimestamp('less than a minute ago')).toEqual('now');
|
||||
expect(shortTimestamp('1 minute ago')).toEqual('1m');
|
||||
expect(shortTimestamp('12 minutes ago')).toEqual('12m');
|
||||
expect(shortTimestamp('a minute ago')).toEqual('1m');
|
||||
expect(shortTimestamp('an hour ago')).toEqual('1h');
|
||||
expect(shortTimestamp('1 hour ago')).toEqual('1h');
|
||||
expect(shortTimestamp('2 hours ago')).toEqual('2h');
|
||||
expect(shortTimestamp('1 day ago')).toEqual('1d');
|
||||
expect(shortTimestamp('a day ago')).toEqual('1d');
|
||||
expect(shortTimestamp('3 days ago')).toEqual('3d');
|
||||
expect(shortTimestamp('a month ago')).toEqual('1mo');
|
||||
expect(shortTimestamp('1 month ago')).toEqual('1mo');
|
||||
expect(shortTimestamp('2 months ago')).toEqual('2mo');
|
||||
expect(shortTimestamp('a year ago')).toEqual('1y');
|
||||
expect(shortTimestamp('1 year ago')).toEqual('1y');
|
||||
expect(shortTimestamp('4 years ago')).toEqual('4y');
|
||||
});
|
||||
|
||||
// Test cases when withAgo is true
|
||||
it('returns correct value with ago', () => {
|
||||
expect(shortTimestamp('less than a minute ago', true)).toEqual('now');
|
||||
expect(shortTimestamp('1 minute ago', true)).toEqual('1m ago');
|
||||
expect(shortTimestamp('12 minutes ago', true)).toEqual('12m ago');
|
||||
expect(shortTimestamp('a minute ago', true)).toEqual('1m ago');
|
||||
expect(shortTimestamp('an hour ago', true)).toEqual('1h ago');
|
||||
expect(shortTimestamp('1 hour ago', true)).toEqual('1h ago');
|
||||
expect(shortTimestamp('2 hours ago', true)).toEqual('2h ago');
|
||||
expect(shortTimestamp('1 day ago', true)).toEqual('1d ago');
|
||||
expect(shortTimestamp('a day ago', true)).toEqual('1d ago');
|
||||
expect(shortTimestamp('3 days ago', true)).toEqual('3d ago');
|
||||
expect(shortTimestamp('a month ago', true)).toEqual('1mo ago');
|
||||
expect(shortTimestamp('1 month ago', true)).toEqual('1mo ago');
|
||||
expect(shortTimestamp('2 months ago', true)).toEqual('2mo ago');
|
||||
expect(shortTimestamp('a year ago', true)).toEqual('1y ago');
|
||||
expect(shortTimestamp('1 year ago', true)).toEqual('1y ago');
|
||||
expect(shortTimestamp('4 years ago', true)).toEqual('4y ago');
|
||||
});
|
||||
});
|
||||
93
app/javascript/shared/helpers/timeHelper.js
Normal file
93
app/javascript/shared/helpers/timeHelper.js
Normal file
@@ -0,0 +1,93 @@
|
||||
import {
|
||||
format,
|
||||
isSameYear,
|
||||
fromUnixTime,
|
||||
formatDistanceToNow,
|
||||
} from 'date-fns';
|
||||
|
||||
/**
|
||||
* Formats a Unix timestamp into a human-readable time format.
|
||||
* @param {number} time - Unix timestamp.
|
||||
* @param {string} [dateFormat='h:mm a'] - Desired format of the time.
|
||||
* @returns {string} Formatted time string.
|
||||
*/
|
||||
export const messageStamp = (time, dateFormat = 'h:mm a') => {
|
||||
const unixTime = fromUnixTime(time);
|
||||
return format(unixTime, dateFormat);
|
||||
};
|
||||
|
||||
/**
|
||||
* Provides a formatted timestamp, adjusting the format based on the current year.
|
||||
* @param {number} time - Unix timestamp.
|
||||
* @param {string} [dateFormat='MMM d, yyyy'] - Desired date format.
|
||||
* @returns {string} Formatted date string.
|
||||
*/
|
||||
export const messageTimestamp = (time, dateFormat = 'MMM d, yyyy') => {
|
||||
const messageTime = fromUnixTime(time);
|
||||
const now = new Date();
|
||||
const messageDate = format(messageTime, dateFormat);
|
||||
if (!isSameYear(messageTime, now)) {
|
||||
return format(messageTime, 'LLL d y, h:mm a');
|
||||
}
|
||||
return messageDate;
|
||||
};
|
||||
|
||||
/**
|
||||
* Converts a Unix timestamp to a relative time string (e.g., 3 hours ago).
|
||||
* @param {number} time - Unix timestamp.
|
||||
* @returns {string} Relative time string.
|
||||
*/
|
||||
export const dynamicTime = time => {
|
||||
const unixTime = fromUnixTime(time);
|
||||
return formatDistanceToNow(unixTime, { addSuffix: true });
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats a Unix timestamp into a specified date format.
|
||||
* @param {number} time - Unix timestamp.
|
||||
* @param {string} [dateFormat='MMM d, yyyy'] - Desired date format.
|
||||
* @returns {string} Formatted date string.
|
||||
*/
|
||||
export const dateFormat = (time, df = 'MMM d, yyyy') => {
|
||||
const unixTime = fromUnixTime(time);
|
||||
return format(unixTime, df);
|
||||
};
|
||||
|
||||
/**
|
||||
* Converts a detailed time description into a shorter format, optionally appending 'ago'.
|
||||
* @param {string} time - Detailed time description (e.g., 'a minute ago').
|
||||
* @param {boolean} [withAgo=false] - Whether to append 'ago' to the result.
|
||||
* @returns {string} Shortened time description.
|
||||
*/
|
||||
export const shortTimestamp = (time, withAgo = false) => {
|
||||
// This function takes a time string and converts it to a short time string
|
||||
// with the following format: 1m, 1h, 1d, 1mo, 1y
|
||||
// The function also takes an optional boolean parameter withAgo
|
||||
// which will add the word "ago" to the end of the time string
|
||||
const suffix = withAgo ? ' ago' : '';
|
||||
const timeMappings = {
|
||||
'less than a minute ago': 'now',
|
||||
'a minute ago': `1m${suffix}`,
|
||||
'an hour ago': `1h${suffix}`,
|
||||
'a day ago': `1d${suffix}`,
|
||||
'a month ago': `1mo${suffix}`,
|
||||
'a year ago': `1y${suffix}`,
|
||||
};
|
||||
// Check if the time string is one of the specific cases
|
||||
if (timeMappings[time]) {
|
||||
return timeMappings[time];
|
||||
}
|
||||
const convertToShortTime = time
|
||||
.replace(/about|over|almost|/g, '')
|
||||
.replace(' minute ago', `m${suffix}`)
|
||||
.replace(' minutes ago', `m${suffix}`)
|
||||
.replace(' hour ago', `h${suffix}`)
|
||||
.replace(' hours ago', `h${suffix}`)
|
||||
.replace(' day ago', `d${suffix}`)
|
||||
.replace(' days ago', `d${suffix}`)
|
||||
.replace(' month ago', `mo${suffix}`)
|
||||
.replace(' months ago', `mo${suffix}`)
|
||||
.replace(' year ago', `y${suffix}`)
|
||||
.replace(' years ago', `y${suffix}`);
|
||||
return convertToShortTime;
|
||||
};
|
||||
Reference in New Issue
Block a user