diff --git a/src/renderer/components/+events/event-details.tsx b/src/renderer/components/+events/event-details.tsx index ded848e8c7..4c64d711e5 100644 --- a/src/renderer/components/+events/event-details.tsx +++ b/src/renderer/components/+events/event-details.tsx @@ -11,6 +11,7 @@ import { KubeObjectMeta } from "../kube-object/kube-object-meta"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { lookupApiLink } from "../../api/kube-api"; import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry"; +import { LocaleDate } from "../locale-date"; interface Props extends KubeObjectDetailsProps { } @@ -38,10 +39,10 @@ export class EventDetails extends React.Component { {event.getSource()} - {event.getFirstSeenTime()} ago {event.firstTimestamp} + {event.getFirstSeenTime()} ago () - {event.getLastSeenTime()} ago {event.lastTimestamp} + {event.getLastSeenTime()} ago () {count} diff --git a/src/renderer/components/+workloads-pods/pod-details-container.tsx b/src/renderer/components/+workloads-pods/pod-details-container.tsx index 99238aa5ad..5cf03184e7 100644 --- a/src/renderer/components/+workloads-pods/pod-details-container.tsx +++ b/src/renderer/components/+workloads-pods/pod-details-container.tsx @@ -13,6 +13,7 @@ import { IMetrics } from "../../api/endpoints/metrics.api"; import { ContainerCharts } from "./container-charts"; import { ResourceType } from "../+cluster-settings/components/cluster-metrics-setting"; import { clusterStore } from "../../../common/cluster-store"; +import { LocaleDate } from '../locale-date'; interface Props { pod: Pod; @@ -39,8 +40,8 @@ export class PodDetailsContainer extends React.Component { {lastState}
Reason: {status.lastState.terminated.reason} - exit code: {status.lastState.terminated.exitCode}
- Started at: {status.lastState.terminated.startedAt}
- Finished at: {status.lastState.terminated.finishedAt}
+ Started at: {}
+ Finished at: {}
); } diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx index fc6efacdfa..666ebc6cb6 100644 --- a/src/renderer/components/dock/log-list.tsx +++ b/src/renderer/components/dock/log-list.tsx @@ -6,9 +6,11 @@ import DOMPurify from "dompurify"; import debounce from "lodash/debounce"; import { action, computed, observable } from "mobx"; import { observer } from "mobx-react"; +import moment from "moment-timezone"; import { Align, ListOnScrollProps } from "react-window"; import { SearchStore, searchStore } from "../../../common/search-store"; +import { userStore } from "../../../common/user-store"; import { cssNames } from "../../utils"; import { Button } from "../button"; import { Icon } from "../icon"; @@ -79,12 +81,15 @@ export class LogList extends React.Component { @computed get logs() { const showTimestamps = logTabStore.getData(this.props.id).showTimestamps; + const { preferences } = userStore; if (!showTimestamps) { return logStore.logsWithoutTimestamps; } - return this.props.logs; + return this.props.logs.map(log => ( + `${moment.tz(logStore.getTimestamps(log)[0] || "", preferences.localeTimezone).format()} ${logStore.removeTimestamps(log)}` + )); } /**