Skip to content

Commit 813f791

Browse files
#RI-3028-change time after select changed (#740)
1 parent 0a471b3 commit 813f791

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const getConsumersOptions = (consumers: ConsumerDto[]) => (
4040
}))
4141
)
4242

43-
const timeOptions: EuiSuperSelectOption<string>[] = [
43+
const timeOptions: EuiSuperSelectOption<ClaimTimeOptions>[] = [
4444
{ value: ClaimTimeOptions.RELATIVE, inputDisplay: 'Relative Time' },
4545
{ value: ClaimTimeOptions.ABSOLUTE, inputDisplay: 'Timestamp' },
4646
]
@@ -95,6 +95,18 @@ const MessageClaimPopover = (props: Props) => {
9595
formik.resetForm()
9696
}
9797

98+
const handleChangeTimeFormat = (value: ClaimTimeOptions) => {
99+
formik.setFieldValue('timeOption', value)
100+
if (value === ClaimTimeOptions.ABSOLUTE) {
101+
formik.setFieldValue(
102+
'timeCount',
103+
new Date().getTime()
104+
)
105+
} else {
106+
formik.setFieldValue('timeCount', '0')
107+
}
108+
}
109+
98110
useEffect(() => {
99111
const consumersWithoutCurrent = filter(consumers, (consumer) => consumer.name !== currentConsumerName)
100112
const sortedConsumers = orderBy(getConsumersOptions(consumersWithoutCurrent), ['name'], ['asc'])
@@ -219,7 +231,7 @@ const MessageClaimPopover = (props: Props) => {
219231
options={timeOptions}
220232
className={styles.timeOptionField}
221233
name="consumerName"
222-
onChange={(value) => formik.setFieldValue('timeOption', value)}
234+
onChange={handleChangeTimeFormat}
223235
data-testid="time-option-select"
224236
/>
225237
</EuiFormRow>

redisinsight/ui/src/slices/browser/stream.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,6 @@ export function ackPendingEntriesAction(
10141014
onSuccessAction?.()
10151015
dispatch(ackPendingEntriesSuccess())
10161016
dispatch(deleteMessageFromList(entries[0]))
1017-
dispatch<any>(fetchConsumers())
10181017
dispatch(addMessageNotification(
10191018
successMessages.MESSAGE_ACTION(entries[0], 'acknowledged')
10201019
))

redisinsight/ui/src/slices/tests/browser/stream.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,6 @@ describe('stream slice', () => {
14041404
const entries = ['0-1']
14051405
const responsePayload = { status: 200 }
14061406

1407-
apiService.post = jest.fn().mockResolvedValue(responsePayload)
14081407
apiService.post = jest.fn().mockResolvedValue(responsePayload)
14091408

14101409
// Act
@@ -1415,7 +1414,6 @@ describe('stream slice', () => {
14151414
ackPendingEntries(),
14161415
ackPendingEntriesSuccess(),
14171416
deleteMessageFromList('0-1'),
1418-
loadConsumerGroups(),
14191417
addMessageNotification(
14201418
successMessages.MESSAGE_ACTION(
14211419
entries.join(''),

0 commit comments

Comments
 (0)