diff --git a/src/helpers/convert-date.js b/src/helpers/convert-date.js index 9fc5e30ca..ca622f41a 100644 --- a/src/helpers/convert-date.js +++ b/src/helpers/convert-date.js @@ -15,6 +15,7 @@ const convertValueToDate = (value) => { day: 'numeric', hour: '2-digit', minute: '2-digit', + second: '2-digit', hour12: true } return date.toLocaleString('en-US', options) diff --git a/src/tests/helpers/convert-date.test.js b/src/tests/helpers/convert-date.test.js index cf08f6d89..bcc7db5e8 100644 --- a/src/tests/helpers/convert-date.test.js +++ b/src/tests/helpers/convert-date.test.js @@ -13,7 +13,7 @@ import { localeMock } from '../utils/localeMock' describe('convertDate', () => { it('should convert a given value to a date string in a specific format', () => { const value = '2022-01-01T00:00:00' - const expectedDate = 'January 1, 2022 at 12:00 AM' + const expectedDate = 'January 1, 2022 at 12:00:00 AM' expect(convertValueToDate(value)).toBe(expectedDate) }) diff --git a/src/tests/modules/real-time-events/constants/tabs-events.test.js b/src/tests/modules/real-time-events/constants/tabs-events.test.js index 1bcf79635..609b243b7 100644 --- a/src/tests/modules/real-time-events/constants/tabs-events.test.js +++ b/src/tests/modules/real-time-events/constants/tabs-events.test.js @@ -61,48 +61,48 @@ describe('RealTimeEventsModule', () => { it('should have the correct columns for each tab', () => { const expectedColumns = { httpRequests: [ + 'tsFormat', 'configurationId', 'host', - 'requestUri', 'requestMethod', 'status', - 'tsFormat' + 'requestUri' ], edgeFunctions: [ + 'tsFormat', 'configurationId', 'functionLanguage', 'edgeFunctionsInitiatorTypeList', 'edgeFunctionsList', - 'edgeFunctionsTime', - 'tsFormat' + 'edgeFunctionsTime' ], edgeFunctionsConsole: [ + 'tsFormat', 'configurationId', 'functionId', 'lineSource', 'level', - 'line', - 'tsFormat' + 'line' ], imageProcessor: [ + 'tsFormat', 'configurationId', 'host', - 'requestUri', 'status', 'bytesSent', - 'tsFormat' + 'requestUri' ], tieredCache: [ + 'tsFormat', 'configurationId', 'host', - 'requestUri', 'requestMethod', 'upstreamCacheStatus', - 'tsFormat' + 'requestUri' ], - edgeDNS: ['level', 'zoneId', 'qtype', 'resolutionType', 'solutionId', 'tsFormat'], - dataStream: ['configurationId', 'jobName', 'endpointType', 'url', 'statusCode', 'tsFormat'], - activityHistory: ['userIp', 'authorName', 'title', 'resourceType', 'resourceId', 'tsFormat'] + edgeDNS: ['tsFormat', 'level', 'zoneId', 'qtype', 'resolutionType', 'solutionId'], + dataStream: ['tsFormat', 'configurationId', 'jobName', 'endpointType', 'url', 'statusCode'], + activityHistory: ['tsFormat', 'userIp', 'authorName', 'title', 'resourceType', 'resourceId'] } Object.entries(TABS_EVENTS).forEach(([tabName, tabData]) => { diff --git a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js index ab37990c6..4dccef45b 100644 --- a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js @@ -101,7 +101,7 @@ describe('ActivityHistoryServices', () => { resourceId: fixtures.activityHistory.resourceId, userId: fixtures.activityHistory.userId, ts: fixtures.activityHistory.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js index 695933389..6e7d67aae 100644 --- a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js @@ -74,7 +74,7 @@ describe('ActivityHistoryServices', () => { userId: fixtures.activityHistory.userId, title: fixtures.activityHistory.title, comment: fixtures.activityHistory.comment, - ts: 'February 23, 2024 at 06:07 PM' + ts: 'February 23, 2024 at 06:07:25 PM' }) }) }) diff --git a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js index 0672100b0..dd29b8fe4 100644 --- a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js @@ -111,7 +111,7 @@ describe('DataStreamingServices', () => { dataStreamed: fixtures.dataStreaming.dataStreamed, source: fixtures.dataStreaming.source, streamedLines: fixtures.dataStreaming.streamedLines, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js index 2ecae4334..538d520e1 100644 --- a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js @@ -78,7 +78,7 @@ describe('DataStreamingServices', () => { source: fixtures.dataStreaming.source, statusCode: fixtures.dataStreaming.statusCode, streamedLines: fixtures.dataStreaming.streamedLines, - ts: 'February 23, 2024 at 06:07 PM' + ts: 'February 23, 2024 at 06:07:25 PM' }) }) }) diff --git a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js index f34e75745..60a10d918 100644 --- a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js +++ b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js @@ -105,7 +105,7 @@ describe('edgeDns', () => { source: fixtures.edgeDns.source, solutionId: fixtures.edgeDns.solutionId, ts: fixtures.edgeDns.ts, - tsFormat: 'February 23, 2024 at 06:07 PM', + tsFormat: 'February 23, 2024 at 06:07:25 PM', uuid: fixtures.edgeDns.uuid, zoneId: fixtures.edgeDns.zoneId } diff --git a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js index 4a85fc049..030bfd1eb 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js @@ -105,7 +105,7 @@ describe('EdgeFunctionsConsoleServices', () => { lineSource: { content: fixtures.edgeFunctionConsole.lineSource, severity: 'info' }, source: fixtures.edgeFunctionConsole.source, ts: fixtures.edgeFunctionConsole.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js index 80ec61389..e93b888e2 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js @@ -79,7 +79,7 @@ describe('EdgeFunctionsConsoleServices', () => { lineSource: fixtures.edgeFunctionConsole.lineSource, solutionId: fixtures.edgeFunctionConsole.solutionId, source: fixtures.edgeFunctionConsole.source, - ts: 'February 23, 2024 at 06:07 PM' + ts: 'February 23, 2024 at 06:07:25 PM' }) }) }) diff --git a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js index 8d0af41ca..0745260bd 100644 --- a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js @@ -97,7 +97,7 @@ describe('EdgeFunctionsServices', () => { edgeFunctionsList: ['function-1', ' function-2', ' function-3'], edgeFunctionsTime: `${fixtures.edgeFunction.edgeFunctionsTime}ms`, ts: fixtures.edgeFunction.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js index 286a5400c..6140e6c38 100644 --- a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js @@ -78,7 +78,7 @@ describe('DataStreamingServices', () => { functionLanguage: fixtures.edgeFunction.functionLanguage, source: fixtures.edgeFunction.source, virtualHostId: fixtures.edgeFunction.virtualhostid, - ts: 'February 23, 2024 at 06:07 PM' + ts: 'February 23, 2024 at 06:07:25 PM' }) }) }) diff --git a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js index e53fc61d1..ca16d2ae2 100644 --- a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js @@ -100,7 +100,7 @@ describe('HttpRequestServices', () => { host: fixtures.httpRequest.host, requestId: fixtures.httpRequest.requestId, ts: fixtures.httpRequest.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js index 38ee14ecf..729ae590b 100644 --- a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js @@ -120,7 +120,7 @@ describe('HttpRequestServices', () => { serverProtocol: undefined, upstreamCacheStatus: undefined, tcpinfoRtt: fixtures.httpRequest.tcpinfoRtt, - ts: 'February 23, 2024 at 06:07 PM', + ts: 'February 23, 2024 at 06:07:25 PM', upstreamAddr: fixtures.httpRequest.upstreamAddr, upstreamBytesReceived: fixtures.httpRequest.upstreamBytesReceived, upstreamBytesSent: fixtures.httpRequest.upstreamBytesSent, diff --git a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js index 3fcaf0ff5..ccbca460d 100644 --- a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js @@ -104,7 +104,7 @@ describe('ImageProcessorServices', () => { httpReferer: fixtures.imageProcessor.httpReferer, httpUserAgent: fixtures.imageProcessor.httpUserAgent, ts: fixtures.imageProcessor.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js index 15d6c8870..39a8317b0 100644 --- a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js @@ -101,7 +101,7 @@ describe('ImageProcessorServices', () => { sslSessionReused: fixtures.imageProcessor.sslSessionReused, status: fixtures.imageProcessor.status, tcpinfoRtt: fixtures.imageProcessor.tcpinfoRtt, - ts: 'February 23, 2024 at 06:07 PM', + ts: 'February 23, 2024 at 06:07:25 PM', upstreamCacheStatus: fixtures.imageProcessor.upstreamCacheStatus, upstreamResponseTime: fixtures.imageProcessor.upstreamResponseTime, upstreamResponseTimeStr: fixtures.imageProcessor.upstreamResponseTimeStr, diff --git a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js index b77678742..522153ba3 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js @@ -106,7 +106,7 @@ describe('tieredCacheServices', () => { proxyHost: fixtures.tieredCache.proxyHost, source: fixtures.tieredCache.source, ts: fixtures.tieredCache.ts, - tsFormat: 'February 23, 2024 at 06:07 PM' + tsFormat: 'February 23, 2024 at 06:07:25 PM' } ], recordsFound: '1' diff --git a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js index 5fe961b7c..cb01cbda3 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js @@ -111,7 +111,7 @@ describe('tieredCacheServices', () => { solution: fixtures.tieredCache.solution, status: fixtures.tieredCache.status, tcpinfoRtt: fixtures.tieredCache.tcpinfoRtt, - ts: 'February 23, 2024 at 06:07 PM', + ts: 'February 23, 2024 at 06:07:25 PM', upstreamBytesReceived: fixtures.tieredCache.upstreamBytesReceived, upstreamBytesReceivedStr: fixtures.tieredCache.upstreamBytesReceivedStr, upstreamCacheStatus: fixtures.tieredCache.upstreamCacheStatus, diff --git a/src/views/RealTimeEvents/Blocks/constants/tabs-events.js b/src/views/RealTimeEvents/Blocks/constants/tabs-events.js index 49fcf6deb..8f3288894 100644 --- a/src/views/RealTimeEvents/Blocks/constants/tabs-events.js +++ b/src/views/RealTimeEvents/Blocks/constants/tabs-events.js @@ -9,6 +9,11 @@ const TABS_EVENTS = { dataset: 'httpEvents', tabRouter: 'http-requests', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -17,11 +22,6 @@ const TABS_EVENTS = { field: 'host', header: 'Host' }, - { - field: 'requestUri', - header: 'Request Uri' - }, - { field: 'requestMethod', header: 'Request Method' @@ -31,9 +31,8 @@ const TABS_EVENTS = { header: 'Status' }, { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' + field: 'requestUri', + header: 'Request Uri' } ], customColumnMapper: (rowData) => ({ @@ -48,6 +47,11 @@ const TABS_EVENTS = { dataset: 'edgeFunctionsEvents', tabRouter: 'edge-functions', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -71,11 +75,6 @@ const TABS_EVENTS = { { field: 'edgeFunctionsTime', header: 'Edge Functions Time' - }, - { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' } ], customColumnMapper: (rowData) => ({ @@ -91,6 +90,11 @@ const TABS_EVENTS = { dataset: 'cellsConsoleEvents', tabRouter: 'edge-functions-console', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -128,11 +132,6 @@ const TABS_EVENTS = { filterPath: 'line', component: (columnData) => columnBuilder({ data: columnData, columnAppearance: 'expand-text-column' }) - }, - { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' } ], customColumnMapper: (rowData) => ({ @@ -150,6 +149,11 @@ const TABS_EVENTS = { dataset: 'imagesProcessedEvents', tabRouter: 'image-processor', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -158,14 +162,6 @@ const TABS_EVENTS = { field: 'host', header: 'Host' }, - { - field: 'requestUri', - header: 'Request Uri', - type: 'component', - filterPath: 'requestUri', - component: (columnData) => - columnBuilder({ data: columnData, columnAppearance: 'expand-text-column' }) - }, { field: 'status', header: 'Status' @@ -175,9 +171,12 @@ const TABS_EVENTS = { header: 'Bytes Sent' }, { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' + field: 'requestUri', + header: 'Request Uri', + type: 'component', + filterPath: 'requestUri', + component: (columnData) => + columnBuilder({ data: columnData, columnAppearance: 'expand-text-column' }) } ], customColumnMapper: (rowData) => ({ @@ -192,6 +191,11 @@ const TABS_EVENTS = { dataset: 'l2CacheEvents', tabRouter: 'tiered-cache', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -200,10 +204,6 @@ const TABS_EVENTS = { field: 'host', header: 'Host' }, - { - field: 'requestUri', - header: 'Request Uri' - }, { field: 'requestMethod', header: 'Request Method' @@ -220,9 +220,8 @@ const TABS_EVENTS = { }) }, { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' + field: 'requestUri', + header: 'Request Uri' } ], customColumnMapper: (rowData) => ({ @@ -237,6 +236,11 @@ const TABS_EVENTS = { dataset: 'idnsQueriesEvents', tabRouter: 'edge-dns', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'level', header: 'Level', @@ -263,11 +267,6 @@ const TABS_EVENTS = { { field: 'solutionId', header: 'Solution ID' - }, - { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' } ], customColumnMapper: (rowData) => ({ @@ -282,6 +281,11 @@ const TABS_EVENTS = { dataset: 'dataStreamedEvents', tabRouter: 'data-stream', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'configurationId', header: 'Configuration ID' @@ -315,11 +319,6 @@ const TABS_EVENTS = { { field: 'statusCode', header: 'Status Code' - }, - { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' } ], customColumnMapper: (rowData) => ({ @@ -336,6 +335,11 @@ const TABS_EVENTS = { dataset: 'activityHistoryEvents', tabRouter: 'activity-history', columns: [ + { + field: 'tsFormat', + sortField: 'ts', + header: 'TS' + }, { field: 'userIp', header: 'User IP' @@ -359,11 +363,6 @@ const TABS_EVENTS = { { field: 'resourceId', header: 'Resource ID' - }, - { - field: 'tsFormat', - sortField: 'ts', - header: 'TS' } ], customColumnMapper: (rowData) => ({