Skip to content

Commit e0bbe90

Browse files
Merge branch 'feature/RI-5934-format-timestamps-across-entire-application' into e2e/feature/RI-5934-format-timestamps-across-entire-application
2 parents 0486393 + b311ea5 commit e0bbe90

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

redisinsight/ui/src/constants/datetime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const dateTimeOptions = [
22
{ inputDisplay: 'HH:mm:ss.SSS d MMM yyyy', value: 'HH:mm:ss.SSS d MMM yyyy' },
3-
{ inputDisplay: 'yyyy-MM-ddHH:mm:ss.sss', value: 'yyyy-MM-ddHH:mm:ss.sss' },
3+
{ inputDisplay: 'yyyy-MM-dd HH:mm:ss.sss', value: 'yyyy-MM-dd HH:mm:ss.sss' },
44
{ inputDisplay: 'dd-MMM-yyyy HH:mm:ss.SSS', value: 'dd-MMM-yyyy HH:mm:ss.SSS' },
55
{ inputDisplay: 'dd.MM.yyyy HH:mm:ss', value: 'dd.MM.yyyy HH:mm:ss' }
66
]

redisinsight/ui/src/pages/browser/modules/key-details/components/stream-details/stream-data-view/StreamDataViewWrapper.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import { streamDataSelector, deleteStreamEntry } from 'uiSrc/slices/browser/stream'
1717
import { ITableColumn } from 'uiSrc/components/virtual-table/interfaces'
1818
import PopoverDelete from 'uiSrc/pages/browser/components/popover-delete/PopoverDelete'
19-
import { KeyTypes, TableCellTextAlignment, TEXT_FAILED_CONVENT_FORMATTER } from 'uiSrc/constants'
19+
import { DATETIME_FORMATTER_DEFAULT, KeyTypes, TableCellTextAlignment, TEXT_FAILED_CONVENT_FORMATTER, TimezoneOption } from 'uiSrc/constants'
2020
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
2121
import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
2222
import { keysSelector, selectedKeySelector, updateSelectedKeyRefreshTime } from 'uiSrc/slices/browser/keys'
@@ -249,7 +249,11 @@ const StreamDataViewWrapper = (props: Props) => {
249249
render: function Id({ id }: StreamEntryDto) {
250250
const idStr = bufferToString(id, viewFormat)
251251
const timestamp = idStr.split('-')?.[0]
252-
const formattedTimestamp = timestamp.length > MAX_FORMAT_LENGTH_STREAM_TIMESTAMP ? '-' : formatTimestamp(timestamp, config?.dateFormat, config?.timezone)
252+
const formattedTimestamp = timestamp.length > MAX_FORMAT_LENGTH_STREAM_TIMESTAMP ? '-' : formatTimestamp(
253+
timestamp,
254+
config?.dateFormat || DATETIME_FORMATTER_DEFAULT,
255+
config?.timezone || TimezoneOption.Local
256+
)
253257

254258
return (
255259
<div>

redisinsight/ui/src/pages/settings/components/general-settings/datetime-formatter/DateTimeFormatter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ const DateTimeFormatter = () => {
240240
onChange={(id) => onRadioOptionChange(id)}
241241
/>
242242
<EuiSpacer size="m" />
243-
<EuiText className={styles.dateTimeSubtitle} color="subdued">Timezone</EuiText>
243+
<EuiText className={styles.dateTimeSubtitle} color="subdued">Specifies the time zone to be used in Redis Insight:</EuiText>
244244
<EuiSpacer size="s" />
245245
<div>
246246
<EuiFlexGroup alignItems="center">

redisinsight/ui/src/utils/formatters/valueFormatters.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import JSONBigInt from 'json-bigint'
99
import { store } from 'uiSrc/slices/store'
1010

1111
import JSONViewer from 'uiSrc/components/json-viewer/JSONViewer'
12-
import { KeyValueFormat } from 'uiSrc/constants'
12+
import { DATETIME_FORMATTER_DEFAULT, KeyValueFormat, TimezoneOption } from 'uiSrc/constants'
1313
import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
1414
import {
1515
anyToBuffer,
@@ -177,7 +177,12 @@ const formattingBuffer = (
177177
// if seconds - add milliseconds (since JS Date works only with milliseconds)
178178
const timestamp = convertTimestampToMilliseconds(value)
179179
const config = get(store.getState(), 'user.settings.config', null)
180-
return { value: formatTimestamp(timestamp, config?.dateFormat, config?.timezone), isValid: true }
180+
return { value: formatTimestamp(
181+
timestamp,
182+
config?.dateFormat || DATETIME_FORMATTER_DEFAULT,
183+
config?.timezone || TimezoneOption.Local,
184+
),
185+
isValid: true }
181186
}
182187
} catch (e) {
183188
// if error return default

0 commit comments

Comments
 (0)