Skip to content

Fixes and Enhancements to group reset functionality #2546

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.

Sign up for GitHub

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
MikeEdgar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes and Enhancements to group reset functionality #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 1 addition & 30 deletions api/src/main/webui/src/api/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,12 +759,7 @@ export interface UserResponse {
data: KafkaUser;
}

// Reset Offset types
export type OffsetValue = 'custom' | 'latest' | 'earliest' | 'specificDateTime' | 'delete';
export type DateTimeFormat = 'ISO' | 'Epoch';
export type TopicSelection = 'allTopics' | 'selectedTopic';
export type PartitionSelection = 'allPartitions' | 'selectedPartition';

// Reset Offset API types
export interface OffsetResetRequest {
topicId: string;
partition?: number;
Expand All @@ -778,28 +773,4 @@ export interface OffsetResetResult {
partition: number;
offset: number | null;
metadata?: string;
}

export interface ResetOffsetFormState {
topicSelection: TopicSelection;
selectedTopicId?: string;
selectedTopicName?: string;
partitionSelection: PartitionSelection;
selectedPartition?: number;
offsetValue: OffsetValue;
customOffset?: number;
dateTime?: string;
dateTimeFormat: DateTimeFormat;
}

export type ResetOffsetErrorType =
| 'CustomOffsetError'
| 'PartitionError'
| 'KafkaError'
| 'SpecificDateTimeNotValidError'
| 'GeneralError';

export interface ResetOffsetError {
type: ResetOffsetErrorType;
message: string;
}
45 changes: 25 additions & 20 deletions api/src/main/webui/src/components/kafka/groups/ResetOffset/DryRunResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import {
Button,
Alert,
AlertVariant,
ModalHeader,
ModalBody,
ModalFooter,
} from '@patternfly/react-core';
import {
Table,
Expand All @@ -19,25 +22,31 @@ import {
Tbody,
Td,
} from '@patternfly/react-table';
import { OffsetResetResult } from '@/api/types';
import { OffsetAndMetadata, OffsetResetResult } from '@/api/types';
import { CliCommandDisplay } from './CliCommandDisplay';

interface DryRunResultsProps {
isOpen: boolean;
results: OffsetResetResult[];
currentOffsets?: OffsetAndMetadata[] | null;
command: string;
onClose: () => void;
onApply: () => void;
isApplying?: boolean;
}

export function DryRunResults({
isOpen,
results,
currentOffsets,
command,
onClose,
onApply,
isApplying = false,
}: DryRunResultsProps) {
const { t } = useTranslation();

const currentOffsetsByPartition = (currentOffsets || []).reduce((acc, offset) => {
acc[`${offset.topicName}-${offset.partition}`] = offset.offset;
return acc;
}, {} as Record<string, number | null>);

// Group results by topic
const resultsByTopic = results.reduce((acc, result) => {
const topicName = result.topicName;
Expand All @@ -50,12 +59,12 @@ export function DryRunResults({

return (
<Modal
variant={ModalVariant.large}
title={t('groups.resetOffset.dryRunResults.title')}
variant={ModalVariant.medium}
isOpen={isOpen}
onClose={onClose}
>
<div style={{ padding: '1.5rem' }}>
<ModalHeader title={t('groups.resetOffset.dryRunResults.title')} />
<ModalBody>
<Alert
variant={AlertVariant.info}
isInline
Expand All @@ -79,6 +88,7 @@ export function DryRunResults({
<Thead>
<Tr>
<Th>{t('groups.resetOffset.dryRunResults.partition')}</Th>
<Th>{t('groups.resetOffset.dryRunResults.currentOffset')}</Th>
<Th>{t('groups.resetOffset.dryRunResults.newOffset')}</Th>
</Tr>
</Thead>
Expand All @@ -88,6 +98,9 @@ export function DryRunResults({
<Td dataLabel={t('groups.resetOffset.dryRunResults.partition')}>
{result.partition}
</Td>
<Td dataLabel={t('groups.resetOffset.dryRunResults.currentOffset')}>
{currentOffsetsByPartition[`${result.topicName}-${result.partition}`] ?? t('common.notAvailable')}
</Td>
<Td dataLabel={t('groups.resetOffset.dryRunResults.newOffset')}>
{result.offset !== null
? result.offset
Expand All @@ -100,24 +113,16 @@ export function DryRunResults({
</div>
))
)}
</div>
<div style={{ padding: '1.5rem', paddingTop: '0', display: 'flex', gap: '0.5rem' }}>
<Button
variant="primary"
onClick={onApply}
isDisabled={isApplying || results.length === 0}
isLoading={isApplying}
>
{t('groups.resetOffset.dryRunResults.apply')}
</Button>
<CliCommandDisplay command={command} />
</ModalBody>
<ModalFooter>
<Button
variant="link"
onClick={onClose}
isDisabled={isApplying}
>
{t('groups.resetOffset.dryRunResults.cancel')}
</Button>
</div>
</ModalFooter>
</Modal>
);
}
Loading