Skip to content

#RI-3028-change time after select changed #740

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

Merged
merged 1 commit into from
Jun 3, 2022
Merged

#RI-3028-change time after select changed #740

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
16 changes: 14 additions & 2 deletions ...owser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const getConsumersOptions = (consumers: ConsumerDto[]) => (
}))
)

const timeOptions: EuiSuperSelectOption<string>[] = [
const timeOptions: EuiSuperSelectOption<ClaimTimeOptions>[] = [
{ value: ClaimTimeOptions.RELATIVE, inputDisplay: 'Relative Time' },
{ value: ClaimTimeOptions.ABSOLUTE, inputDisplay: 'Timestamp' },
]
Expand Down Expand Up @@ -95,6 +95,18 @@ const MessageClaimPopover = (props: Props) => {
formik.resetForm()
}

const handleChangeTimeFormat = (value: ClaimTimeOptions) => {
formik.setFieldValue('timeOption', value)
if (value === ClaimTimeOptions.ABSOLUTE) {
formik.setFieldValue(
'timeCount',
new Date().getTime()
)
} else {
formik.setFieldValue('timeCount', '0')
}
}

useEffect(() => {
const consumersWithoutCurrent = filter(consumers, (consumer) => consumer.name !== currentConsumerName)
const sortedConsumers = orderBy(getConsumersOptions(consumersWithoutCurrent), ['name'], ['asc'])
Expand Down Expand Up @@ -219,7 +231,7 @@ const MessageClaimPopover = (props: Props) => {
options={timeOptions}
className={styles.timeOptionField}
name="consumerName"
onChange={(value) => formik.setFieldValue('timeOption', value)}
onChange={handleChangeTimeFormat}
data-testid="time-option-select"
/>
</EuiFormRow>
Expand Down
1 change: 0 additions & 1 deletion redisinsight/ui/src/slices/browser/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,6 @@ export function ackPendingEntriesAction(
onSuccessAction?.()
dispatch(ackPendingEntriesSuccess())
dispatch(deleteMessageFromList(entries[0]))
dispatch<any>(fetchConsumers())
dispatch(addMessageNotification(
successMessages.MESSAGE_ACTION(entries[0], 'acknowledged')
))
Expand Down
2 changes: 0 additions & 2 deletions redisinsight/ui/src/slices/tests/browser/stream.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,6 @@ describe('stream slice', () => {
const entries = ['0-1']
const responsePayload = { status: 200 }

apiService.post = jest.fn().mockResolvedValue(responsePayload)
apiService.post = jest.fn().mockResolvedValue(responsePayload)

// Act
Expand All @@ -1415,7 +1414,6 @@ describe('stream slice', () => {
ackPendingEntries(),
ackPendingEntriesSuccess(),
deleteMessageFromList('0-1'),
loadConsumerGroups(),
addMessageNotification(
successMessages.MESSAGE_ACTION(
entries.join(''),
Expand Down