Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: dynamically update timestamps based on the chosen timezone in the Advanced Settings #196977

Merged
merged 6 commits into from
Oct 24, 2024
Merged

fix: dynamically update timestamps based on the chosen timezone in the Advanced Settings #196977

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04c349e
fix: update dynamically timestamps based on chosen timezone
paulinashakirova Oct 19, 2024
22d66cd
update function using only timeZone from moment
paulinashakirova Oct 22, 2024
a52b759
fix: remove import duplication
paulinashakirova Oct 22, 2024
65d0179
fix failing tests - mock dependency
paulinashakirova Oct 23, 2024
ef6b086
remove mocking dep in tests and replace import in component
paulinashakirova Oct 23, 2024
ead6569
Merge branch 'main' into dynamic-update-timestamp-based-on-timezone-i…
paulinashakirova Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ...tent-management/content_insights/content_insights_public/src/components/activity_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import moment from 'moment-timezone';
import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';
import {
Expand Down Expand Up @@ -97,10 +98,16 @@ export const ActivityView = ({ item }: ActivityViewProps) => {
);
};

const dateFormatter = new Intl.DateTimeFormat(i18n.getLocale(), {
dateStyle: 'long',
timeStyle: 'short',
});
const formatDate = (time: string) => {
const locale = i18n.getLocale();
const timeZone = moment().tz();

return new Intl.DateTimeFormat(locale, {
dateStyle: 'long',
timeStyle: 'short',
timeZone,
}).format(new Date(time));
};

const ActivityCard = ({
what,
Expand Down Expand Up @@ -130,7 +137,7 @@ const ActivityCard = ({
id="contentManagement.contentEditor.activity.lastUpdatedByDateTime"
defaultMessage="on {dateTime}"
values={{
dateTime: dateFormatter.format(new Date(when)),
dateTime: formatDate(when),
}}
/>
</EuiText>
Expand Down