Skip to content

FE: Customize user timezone #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import useAppParams from 'lib/hooks/useAppParams';
import { useResetConsumerGroupOffsetsMutation } from 'lib/hooks/api/consumers';
import { FlexFieldset, StyledForm } from 'components/common/Form/Form.styled';
import ControlledSelect from 'components/common/Select/ControlledSelect';
import { useTimezone } from 'lib/hooks/useTimezones';

import * as S from './ResetOffsets.styled';

Expand All @@ -38,6 +39,7 @@ const resetTypeOptions = Object.values(ConsumerGroupOffsetsResetType).map(

const Form: React.FC<FormProps> = ({ defaultValues, partitions, topics }) => {
const navigate = useNavigate();
const { getDateInCurrentTimezone } = useTimezone();
const routerParams = useAppParams<ClusterGroupParam>();
const reset = useResetConsumerGroupOffsetsMutation(routerParams);
const topicOptions = React.useMemo(
Expand Down Expand Up @@ -142,8 +144,12 @@ const Form: React.FC<FormProps> = ({ defaultValues, partitions, topics }) => {
render={({ field: { onChange, onBlur, value, ref } }) => (
<S.DatePickerInput
ref={ref}
selected={new Date(value as number)}
onChange={(e: Date | null) => onChange(e?.getTime())}
selected={getDateInCurrentTimezone(
new Date(value as number)
)}
onChange={(selectedDate: Date | null) => {
onChange(selectedDate?.getTime());
}}
onBlur={onBlur}
/>
)}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/NavBar/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import ProductHuntIcon from 'components/common/Icons/ProductHuntIcon';
import { Button } from 'components/common/Button/Button';
import MenuIcon from 'components/common/Icons/MenuIcon';

import { UserTimezone } from './UserTimezone/UserTimezone';
import UserInfo from './UserInfo/UserInfo';
import * as S from './NavBar.styled';

Expand Down Expand Up @@ -73,6 +74,8 @@ const NavBar: React.FC<Props> = ({ onBurgerClick }) => {
</S.NavbarBrand>
</S.NavbarBrand>
<S.NavbarSocial>
<UserTimezone />

<Select
options={options}
value={themeMode}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import styled from 'styled-components';

export const SelectedTimezoneContainer = styled.div`
display: flex;
justify-content: center;
align-items: center;
gap: 4px;
`;

export const ContentContainer = styled.div`
display: flex;
width: 320px;
flex-direction: column;
max-height: 640px;
gap: 8px;
`;

export const InputContainer = styled.div`
position: sticky;
top: 0;
background-color: white;
z-index: 1;
`;

export const ItemsContainer = styled.div`
overflow-y: auto;
`;
73 changes: 73 additions & 0 deletions frontend/src/components/NavBar/UserTimezone/UserTimezone.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { Button } from 'components/common/Button/Button';
import ChevronDownIcon from 'components/common/Icons/ChevronDownIcon';
import { Dropdown, DropdownItem } from 'components/common/Dropdown';
import React, { useMemo, useState } from 'react';
import Input from 'components/common/Input/Input';
import { TIMEZONES, useTimezone } from 'lib/hooks/useTimezones';

import * as S from './UserTimezone.styled';

export const UserTimezone = () => {
const { currentTimezone, availableTimezones, setTimezone } = useTimezone();

const [searchValue, setSearchValue] = useState('');

const filteredTimezones = useMemo(() => {
if (!searchValue.trim()) return availableTimezones;

const searchLower = searchValue.toLowerCase();
return TIMEZONES.filter(
(timezone) =>
timezone.value.toLowerCase().includes(searchLower) ||
timezone.offset.toLowerCase().includes(searchLower)
);
}, [searchValue]);

const handleTimezoneSelect = (timezone: typeof currentTimezone) => {
setTimezone(timezone);
setSearchValue('');
};

const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setSearchValue(e.target.value);
};

return (
<Dropdown
onClose={() => setSearchValue('')}
align="center"
openBtnEl={
<Button buttonType="text" buttonSize="L">
<S.SelectedTimezoneContainer>
<p>{currentTimezone.UTCOffset}</p>
<ChevronDownIcon fill="currentColor" width="16" height="16" />
</S.SelectedTimezoneContainer>
</Button>
}
>
<S.ContentContainer>
<S.InputContainer>
<Input
type="text"
placeholder="Search timezone..."
value={searchValue}
onChange={handleSearchChange}
inputSize="M"
search
/>
</S.InputContainer>

<S.ItemsContainer>
{filteredTimezones.map((timezone) => (
<DropdownItem
key={timezone.value}
onClick={() => handleTimezoneSelect(timezone)}
>
{timezone.label}
</DropdownItem>
))}
</S.ItemsContainer>
</S.ContentContainer>
</Dropdown>
);
};
6 changes: 5 additions & 1 deletion frontend/src/components/Topics/Topic/Messages/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { JSONPath } from 'jsonpath-plus';
import Ellipsis from 'components/common/Ellipsis/Ellipsis';
import WarningRedIcon from 'components/common/Icons/WarningRedIcon';
import Tooltip from 'components/common/Tooltip/Tooltip';
import { useTimezone } from 'lib/hooks/useTimezones';

import MessageContent from './MessageContent/MessageContent';
import * as S from './MessageContent/MessageContent.styled';
Expand Down Expand Up @@ -41,6 +42,7 @@ const Message: React.FC<Props> = ({
keyFilters,
contentFilters,
}) => {
const { currentTimezone } = useTimezone();
const [isOpen, setIsOpen] = React.useState(false);
const savedMessageJson = {
Value: value,
Expand Down Expand Up @@ -107,7 +109,9 @@ const Message: React.FC<Props> = ({
<td>{offset}</td>
<td>{partition}</td>
<td>
<div>{formatTimestamp(timestamp)}</div>
<div>
{formatTimestamp({ timestamp, timezone: currentTimezone.value })}
</div>
</td>
<S.DataCell title={key}>
<Ellipsis text={renderFilteredJson(key, keyFilters)}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import EditorViewer from 'components/common/EditorViewer/EditorViewer';
import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
import { formatTimestamp } from 'lib/dateTimeHelpers';
import { useTimezone } from 'lib/hooks/useTimezones';

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

Expand Down Expand Up @@ -31,6 +32,8 @@ const MessageContent: React.FC<MessageContentProps> = ({
keySerde,
valueSerde,
}) => {
const { currentTimezone } = useTimezone();

const [activeTab, setActiveTab] = React.useState<Tab>('content');
const activeTabContent = () => {
switch (activeTab) {
Expand Down Expand Up @@ -103,7 +106,12 @@ const MessageContent: React.FC<MessageContentProps> = ({
<S.Metadata>
<S.MetadataLabel>Timestamp</S.MetadataLabel>
<span>
<S.MetadataValue>{formatTimestamp(timestamp)}</S.MetadataValue>
<S.MetadataValue>
{formatTimestamp({
timestamp,
timezone: currentTimezone.value,
})}
</S.MetadataValue>
<S.MetadataMeta>Timestamp type: {timestampType}</S.MetadataMeta>
</span>
</S.Metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Message component', () => {
expect(screen.getByText(mockMessage.value as string)).toBeInTheDocument();
expect(screen.getByText(mockMessage.key as string)).toBeInTheDocument();
expect(
screen.getByText(formatTimestamp(mockMessage.timestamp))
screen.getByText(formatTimestamp({ timestamp: mockMessage.timestamp }))
).toBeInTheDocument();
expect(screen.getByText(mockMessage.offset.toString())).toBeInTheDocument();
expect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import * as Metrics from 'components/common/Metrics';
import { TopicAnalysisStats } from 'generated-sources';
import { formatTimestamp } from 'lib/dateTimeHelpers';
import { useTimezone } from 'lib/hooks/useTimezones';

const Total: React.FC<TopicAnalysisStats> = ({
totalMsgs,
Expand All @@ -14,14 +15,16 @@ const Total: React.FC<TopicAnalysisStats> = ({
approxUniqKeys,
approxUniqValues,
}) => {
const { currentTimezone } = useTimezone();

return (
<Metrics.Section title="Messages">
<Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>
<Metrics.Indicator label="Offsets min-max">
{`${minOffset} - ${maxOffset}`}
</Metrics.Indicator>
<Metrics.Indicator label="Timestamp min-max">
{`${formatTimestamp(minTimestamp)} - ${formatTimestamp(maxTimestamp)}`}
{`${formatTimestamp({ timestamp: minTimestamp, timezone: currentTimezone.value })} - ${formatTimestamp({ timestamp: maxTimestamp, timezone: currentTimezone.value })}`}
</Metrics.Indicator>
<Metrics.Indicator label="Null keys">{nullKeys}</Metrics.Indicator>
<Metrics.Indicator
Expand Down
21 changes: 16 additions & 5 deletions frontend/src/components/Topics/Topic/Statistics/Metrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
import { calculateTimer, formatTimestamp } from 'lib/dateTimeHelpers';
import { Action, ResourceType } from 'generated-sources';
import { ActionButton } from 'components/common/ActionComponent';
import { useTimezone } from 'lib/hooks/useTimezones';

import * as S from './Statistics.styles';
import Total from './Indicators/Total';
Expand All @@ -25,6 +26,7 @@ import { LabelValue } from './Statistics.styles';

const Metrics: React.FC = () => {
const params = useAppParams<RouteParamsClusterTopic>();
const { currentTimezone } = useTimezone();

const [isAnalyzing, setIsAnalyzing] = useState(true);
const analyzeTopic = useAnalyzeTopic(params);
Expand Down Expand Up @@ -69,10 +71,14 @@ const Metrics: React.FC = () => {
<List>
<Label>Started at</Label>
<LabelValue>
{formatTimestamp(data.progress.startedAt, {
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
{formatTimestamp({
timestamp: data.progress.startedAt,
format: {
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
},
timezone: currentTimezone.value,
})}
</LabelValue>
<Label>Passed since start</Label>
Expand Down Expand Up @@ -100,7 +106,12 @@ const Metrics: React.FC = () => {
return (
<>
<S.ActionsBar>
<S.CreatedAt>{formatTimestamp(data?.result?.finishedAt)}</S.CreatedAt>
<S.CreatedAt>
{formatTimestamp({
timezone: currentTimezone.value,
timestamp: data?.result?.finishedAt,
})}
</S.CreatedAt>
<ActionButton
onClick={async () => {
await analyzeTopic.mutateAsync();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from 'components/common/PropertiesList/PropertiesList.styled';
import { TopicAnalysisStats } from 'generated-sources';
import { formatTimestamp } from 'lib/dateTimeHelpers';
import { useTimezone } from 'lib/hooks/useTimezones';

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

Expand All @@ -25,6 +26,9 @@ const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
keySize,
valueSize,
} = row.original;

const { currentTimezone } = useTimezone();

return (
<S.PartitionInfo>
<div>
Expand All @@ -35,9 +39,19 @@ const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
<Label>Total size</Label>
<BytesFormatted value={(keySize?.sum || 0) + (valueSize?.sum || 0)} />
<Label>Min. timestamp</Label>
<span>{formatTimestamp(minTimestamp)}</span>
<span>
{formatTimestamp({
timestamp: minTimestamp,
timezone: currentTimezone.value,
})}
</span>
<Label>Max. timestamp</Label>
<span>{formatTimestamp(maxTimestamp)}</span>
<span>
{formatTimestamp({
timestamp: maxTimestamp,
timezone: currentTimezone.value,
})}
</span>
<Label>Null keys amount</Label>
<span>{nullKeys}</span>
<Label>Null values amount</Label>
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/components/Version/Version.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import WarningIcon from 'components/common/Icons/WarningIcon';
import { gitCommitPath } from 'lib/paths';
import { useLatestVersion } from 'lib/hooks/api/latestVersion';
import { formatTimestamp } from 'lib/dateTimeHelpers';
import { useTimezone } from 'lib/hooks/useTimezones';

import * as S from './Version.styled';

const Version: React.FC = () => {
const { currentTimezone } = useTimezone();
const { data: latestVersionInfo = {} } = useLatestVersion();
const { buildTime, commitId, isLatestRelease, version } =
latestVersionInfo.build;
Expand All @@ -15,7 +17,10 @@ const Version: React.FC = () => {
const currentVersion =
isLatestRelease && version?.match(versionTag)
? versionTag
: formatTimestamp(buildTime);
: formatTimestamp({
timestamp: buildTime,
timezone: currentTimezone.value,
});

return (
<S.Wrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const Dropdown = styled(ControlledMenu)(
${menuSelector.name} {
border: 1px solid ${dropdown.borderColor};
box-shadow: 0 4px 16px ${dropdown.shadow};
padding: 8px 0;
padding: 8px 4px;
border-radius: 4px;
font-size: 14px;
background-color: ${dropdown.backgroundColor};
Expand Down
Loading
Loading