switch from .tolocaleString() to day.js

azukaar · Sep 23, 2024 · a6cb93f · a6cb93f
1 parent a4423e9
commit a6cb93f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/client/src/pages/config/users/usermanagement.jsx b/client/src/pages/config/users/usermanagement.jsx
@@ -23,6 +23,7 @@ import MainCard from '../../../components/MainCard';
 import { useEffect, useState } from 'react';
 import PrettyTableView from '../../../components/tableView/prettyTableView';
 import { Trans, useTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
 
 const UserManagement = () => {
     const { t } = useTranslation();
@@ -248,14 +249,14 @@ const UserManagement = () => {
                 {
                     title: t('global.createdAt'),
                     screenMin: 'lg',
-                    field: (r) => new Date(r.createdAt).toLocaleString(),
+                    field: (r) => dayjs(new Date(r.createdAt)).format('L, LT'),
                 },
                 {
                     title: t('mgmt.usermgmt.lastLogin'),
                     screenMin: 'lg', 
                     field: (r) => {
                         const hasLastLogin = new Date(r.lastLogin).getTime() > 0;
-                        return <>{hasLastLogin ? new Date(r.lastLogin).toLocaleString() : t('global.never')}</>
+                        return <>{hasLastLogin ? dayjs(new Date(r.lastLogin)).format('L, LT') : t('global.never')}</>
                     },
                 },
                 {

diff --git a/client/src/pages/dashboard/AlertPage.jsx b/client/src/pages/dashboard/AlertPage.jsx
@@ -30,6 +30,7 @@ import { DeleteButton } from '../../components/delete';
 import { CosmosCheckbox, CosmosFormDivider, CosmosInputText, CosmosSelect } from '../config/users/formShortcuts';
 import { MetricPicker } from './MetricsPicker';
 import { useTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
 
 const DisplayOperator = (operator) => {
   switch (operator) {
@@ -482,7 +483,7 @@ const AlertPage = () => {
                 { 
                   title: t('navigation.monitoring.alerts.astTriggeredTitle'),
                   screenMin: 'md',
-                  field: (r) => (r.LastTriggered != "0001-01-01T00:00:00Z") ? new Date(r.LastTriggered).toLocaleString() : t('global.never'),
+                  field: (r) => (r.LastTriggered != "0001-01-01T00:00:00Z") ? dayjs(new Date(r.LastTriggered)).format('L, LT') : t('global.never'),
                 },
                 { 
                   title: t('navigation.monitoring.alerts.actionsTitle'), 

diff --git a/client/src/pages/dashboard/eventsExplorer.jsx b/client/src/pages/dashboard/eventsExplorer.jsx
@@ -160,7 +160,7 @@ const EventsExplorer = ({from, to, xAxis, zoom, slot, initLevel, initSearch = ''
 			</Stack>
 			<div>
 				{!loading &&
-					<Trans i18nKey="navigation.monitoring.events.eventsFound" count={total} values={{from: from.toLocaleString(), to: to.toLocaleString()}}/>
+					<Trans i18nKey="navigation.monitoring.events.eventsFound" count={total} values={{from: dayjs(from).format('L, LT'), to: dayjs(to).format('L, LT')}}/>
 				}
 			</div>
 			<div>
@@ -172,7 +172,7 @@ const EventsExplorer = ({from, to, xAxis, zoom, slot, initLevel, initSearch = ''
 									event.level == "debug" ? <SettingOutlined /> : event.level == "important" ? <ExclamationOutlined /> : undefined
 								}>
 									<div style={{fontWeight: 'bold', fontSize: '120%'}}>{event.label}</div>
-									<div>{(new Date(event.date)).toLocaleString()} - {dayjs(event.date).fromNow()}</div>
+									<div>{dayjs(event.date).format('L, LT')} - {dayjs(event.date).fromNow()}</div>
 									<div>{event.eventId} - {event.object}</div>
 								</Alert>}>
 								<div style={{overflow: 'auto'}}>

diff --git a/client/src/pages/servapps/networks.jsx b/client/src/pages/servapps/networks.jsx
@@ -7,6 +7,7 @@ import * as API from '../../api';
 import PrettyTableView from '../../components/tableView/prettyTableView';
 import NewNetworkButton from './createNetwork';
 import { useTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
 
 export const NetworksColumns = (theme, isDark, t) => [
   {
@@ -42,7 +43,7 @@ export const NetworksColumns = (theme, isDark, t) => [
   {
     title: t('global.createdAt'),
     screenMin: 'lg',
-    field: (r) => r.Created ? new Date(r.Created).toLocaleString() : '-',
+    field: (r) => r.Created ? dayjs(new Date(r.Created)).format('L, LT') : '-',
   },
 ];
 

diff --git a/client/src/pages/servapps/volumes.jsx b/client/src/pages/servapps/volumes.jsx
@@ -15,6 +15,7 @@ import HostChip from '../../components/hostChip';
 import PrettyTableView from '../../components/tableView/prettyTableView';
 import NewVolumeButton from './createVolumes';
 import { useTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
 
 const VolumeManagementList = () => {
     const { t } = useTranslation();
@@ -76,7 +77,7 @@ const VolumeManagementList = () => {
                         {
                             title: t('global.createdAt'),
                             screenMin: 'lg', 
-                            field: (r) => new Date(r.CreatedAt).toLocaleString(),
+                            field: (r) => dayjs(new Date(r.CreatedAt)).format('L, LT'),
                         },
                         {
                             title: '',