diff --git a/redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx b/redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx index 40a6dff0a0..9df216111b 100644 --- a/redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx +++ b/redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx @@ -40,7 +40,7 @@ const getConsumersOptions = (consumers: ConsumerDto[]) => ( })) ) -const timeOptions: EuiSuperSelectOption[] = [ +const timeOptions: EuiSuperSelectOption[] = [ { value: ClaimTimeOptions.RELATIVE, inputDisplay: 'Relative Time' }, { value: ClaimTimeOptions.ABSOLUTE, inputDisplay: 'Timestamp' }, ] @@ -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']) @@ -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" /> diff --git a/redisinsight/ui/src/slices/browser/stream.ts b/redisinsight/ui/src/slices/browser/stream.ts index 2dac8652d3..9251811ac7 100644 --- a/redisinsight/ui/src/slices/browser/stream.ts +++ b/redisinsight/ui/src/slices/browser/stream.ts @@ -1014,7 +1014,6 @@ export function ackPendingEntriesAction( onSuccessAction?.() dispatch(ackPendingEntriesSuccess()) dispatch(deleteMessageFromList(entries[0])) - dispatch(fetchConsumers()) dispatch(addMessageNotification( successMessages.MESSAGE_ACTION(entries[0], 'acknowledged') )) diff --git a/redisinsight/ui/src/slices/tests/browser/stream.spec.ts b/redisinsight/ui/src/slices/tests/browser/stream.spec.ts index f4fe9ec73d..a344cb0302 100644 --- a/redisinsight/ui/src/slices/tests/browser/stream.spec.ts +++ b/redisinsight/ui/src/slices/tests/browser/stream.spec.ts @@ -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 @@ -1415,7 +1414,6 @@ describe('stream slice', () => { ackPendingEntries(), ackPendingEntriesSuccess(), deleteMessageFromList('0-1'), - loadConsumerGroups(), addMessageNotification( successMessages.MESSAGE_ACTION( entries.join(''),