Skip to content

Commit 027d9b4

Browse files
HaaroleanMgrdich
andauthored
Change message timestamp format (#3113)
* Drop experimental endpoints * [FE] Change message timestamp format (#3119) * remove dayjs from the code base * remove dayjs library and clean up the hook codes * minor obsolete fixtures deletion * minor provider code modifications * minor provider code modifications * minor linter code modifications * minor date local and language code modifications Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com> * removing timestamp api from the generated sources Co-authored-by: Mgrdich <46796009+Mgrdich@users.noreply.github.com> Co-authored-by: Mgrdich <mgotm13@gmail.com>
1 parent 33784e3 commit 027d9b4

File tree

22 files changed

+63
-199
lines changed

22 files changed

+63
-199
lines changed

kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,33 +1729,6 @@ paths:
17291729
$ref: '#/components/schemas/PartitionsIncreaseResponse'
17301730
404:
17311731
description: Not found
1732-
/api/info/timestampformat:
1733-
get:
1734-
tags:
1735-
- TimeStampFormat
1736-
summary: get system default datetime format
1737-
operationId: getTimeStampFormat
1738-
responses:
1739-
200:
1740-
description: OK
1741-
content:
1742-
application/json:
1743-
schema:
1744-
$ref: '#/components/schemas/TimeStampFormat'
1745-
1746-
/api/info/timestampformat/iso:
1747-
get:
1748-
tags:
1749-
- TimeStampFormat
1750-
summary: get system default datetime format (in ISO format, for JS)
1751-
operationId: getTimeStampFormatISO
1752-
responses:
1753-
200:
1754-
description: OK
1755-
content:
1756-
application/json:
1757-
schema:
1758-
$ref: '#/components/schemas/TimeStampFormat'
17591732

17601733
/api/authorization:
17611734
get:

kafka-ui-react-app/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"ajv": "^8.6.3",
2323
"babel-jest": "^29.0.3",
2424
"classnames": "^2.2.6",
25-
"dayjs": "^1.11.2",
2625
"fetch-mock": "^9.11.0",
2726
"jest": "^29.0.3",
2827
"jest-watch-typeahead": "^2.0.0",

kafka-ui-react-app/pnpm-lock.yaml

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import React from 'react';
33
import styled from 'styled-components';
44
import useDataSaver from 'lib/hooks/useDataSaver';
55
import { TopicMessage } from 'generated-sources';
6-
import { useTimeFormat } from 'lib/hooks/useTimeFormat';
76
import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
87
import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
98
import { Dropdown, DropdownItem } from 'components/common/Dropdown';
9+
import { formatTimestamp } from 'lib/dateTimeHelpers';
1010

1111
import MessageContent from './MessageContent/MessageContent';
1212
import * as S from './MessageContent/MessageContent.styled';
@@ -58,7 +58,6 @@ const Message: React.FC<Props> = ({
5858
Headers: headers,
5959
Timestamp: timestamp,
6060
};
61-
const formatTimestamp = useTimeFormat();
6261

6362
const savedMessage = JSON.stringify(savedMessageJson, null, '\t');
6463
const { copyToClipboard, saveFile } = useDataSaver(

kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import EditorViewer from 'components/common/EditorViewer/EditorViewer';
33
import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
4-
import { useTimeFormat } from 'lib/hooks/useTimeFormat';
54
import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
5+
import { formatTimestamp } from 'lib/dateTimeHelpers';
66

77
import * as S from './MessageContent.styled';
88

@@ -27,8 +27,6 @@ const MessageContent: React.FC<MessageContentProps> = ({
2727
timestamp,
2828
timestampType,
2929
}) => {
30-
const formatTimestamp = useTimeFormat();
31-
3230
const [activeTab, setActiveTab] = React.useState<Tab>('content');
3331

3432
const activeTabContent = () => {

kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import React from 'react';
22
import { TopicMessage, TopicMessageTimestampTypeEnum } from 'generated-sources';
3-
import Message, {
4-
PreviewFilter,
5-
Props,
6-
} from 'components/Topics/Topic/Messages/Message';
3+
import Message, { Props } from 'components/Topics/Topic/Messages/Message';
74
import { screen } from '@testing-library/react';
85
import { render } from 'lib/testHelpers';
96
import userEvent from '@testing-library/user-event';
107
import { formatTimestamp } from 'lib/dateTimeHelpers';
118

129
const messageContentText = 'messageContentText';
13-
const format = 'DD.MM.YYYY HH:mm:ss';
1410

1511
jest.mock(
1612
'components/Topics/Topic/Messages/MessageContent/MessageContent',
@@ -33,9 +29,6 @@ describe('Message component', () => {
3329
headers: { header: 'test' },
3430
};
3531

36-
const mockKeyFilters: PreviewFilter[] = [];
37-
const mockContentFilters: PreviewFilter[] = [];
38-
3932
const renderComponent = (
4033
props: Partial<Props> = {
4134
message: mockMessage,
@@ -46,8 +39,8 @@ describe('Message component', () => {
4639
<tbody>
4740
<Message
4841
message={props.message || mockMessage}
49-
keyFilters={mockKeyFilters}
50-
contentFilters={mockContentFilters}
42+
keyFilters={[]}
43+
contentFilters={[]}
5144
/>
5245
</tbody>
5346
</table>
@@ -58,7 +51,7 @@ describe('Message component', () => {
5851
expect(screen.getByText(mockMessage.content as string)).toBeInTheDocument();
5952
expect(screen.getByText(mockMessage.key as string)).toBeInTheDocument();
6053
expect(
61-
screen.getByText(formatTimestamp(mockMessage.timestamp, format))
54+
screen.getByText(formatTimestamp(mockMessage.timestamp))
6255
).toBeInTheDocument();
6356
expect(screen.getByText(mockMessage.offset.toString())).toBeInTheDocument();
6457
expect(

kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import * as Metrics from 'components/common/Metrics';
3-
import { useTimeFormat } from 'lib/hooks/useTimeFormat';
43
import { TopicAnalysisStats } from 'generated-sources';
4+
import { formatTimestamp } from 'lib/dateTimeHelpers';
55

66
const Total: React.FC<TopicAnalysisStats> = ({
77
totalMsgs,
@@ -14,8 +14,6 @@ const Total: React.FC<TopicAnalysisStats> = ({
1414
approxUniqKeys,
1515
approxUniqValues,
1616
}) => {
17-
const formatTimestamp = useTimeFormat();
18-
1917
return (
2018
<Metrics.Section title="Messages">
2119
<Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>

kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {
1313
Label,
1414
} from 'components/common/PropertiesList/PropertiesList.styled';
1515
import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
16-
import { useTimeFormat } from 'lib/hooks/useTimeFormat';
17-
import { calculateTimer } from 'lib/dateTimeHelpers';
16+
import { calculateTimer, formatTimestamp } from 'lib/dateTimeHelpers';
1817
import { Action, ResourceType } from 'generated-sources';
1918
import { ActionButton } from 'components/common/ActionComponent';
2019

@@ -24,8 +23,6 @@ import SizeStats from './Indicators/SizeStats';
2423
import PartitionTable from './PartitionTable';
2524

2625
const Metrics: React.FC = () => {
27-
const formatTimestamp = useTimeFormat();
28-
2926
const params = useAppParams<RouteParamsClusterTopic>();
3027

3128
const [isAnalyzing, setIsAnalyzing] = useState(true);
@@ -68,7 +65,13 @@ const Metrics: React.FC = () => {
6865
</ActionButton>
6966
<List>
7067
<Label>Started at</Label>
71-
<span>{formatTimestamp(data.progress.startedAt, 'hh:mm:ss a')}</span>
68+
<span>
69+
{formatTimestamp(data.progress.startedAt, {
70+
hour: 'numeric',
71+
minute: 'numeric',
72+
second: 'numeric',
73+
})}
74+
</span>
7275
<Label>Passed since start</Label>
7376
<span>{calculateTimer(data.progress.startedAt as number)}</span>
7477
<Label>Scanned messages</Label>

kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ import {
66
List,
77
Label,
88
} from 'components/common/PropertiesList/PropertiesList.styled';
9-
import { useTimeFormat } from 'lib/hooks/useTimeFormat';
109
import { TopicAnalysisStats } from 'generated-sources';
10+
import { formatTimestamp } from 'lib/dateTimeHelpers';
1111

1212
import * as S from './Statistics.styles';
1313

1414
const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
1515
row,
1616
}) => {
17-
const formatTimestamp = useTimeFormat();
18-
1917
const {
2018
totalMsgs,
2119
minTimestamp,

0 commit comments

Comments
 (0)