Skip to content

#RI-3013,3014 - scroll, update success messages #736

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 2 commits into from
Jun 2, 2022
Merged

#RI-3013,3014 - scroll, update success messages #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f39da74
#RI-3013,3014 - scroll, update success messages
AmirAllayarovSofteq Jun 2, 2022
5a2e5a8
resolve comments
AmirAllayarovSofteq Jun 2, 2022
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
4 changes: 4 additions & 0 deletions redisinsight/ui/src/components/notifications/success-messages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,9 @@ export default {
{actionName}.
</>
),
}),
NO_CLAIMED_MESSAGES: () => ({
title: 'No messages claimed',
message: 'No messages exceed the minimum idle time.',
})
}
42 changes: 29 additions & 13 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 @@ -13,7 +13,8 @@ import {
EuiSwitch,
EuiText,
EuiCheckbox,
EuiSpacer
EuiSpacer,
EuiToolTip
} from '@elastic/eui'
import { useFormik } from 'formik'
import { orderBy, filter } from 'lodash'
Expand Down Expand Up @@ -106,9 +107,35 @@ const MessageClaimPopover = (props: Props) => {
}
}, [consumers, currentConsumerName])

const button = (
<EuiButton
size="s"
color="secondary"
aria-label="Claim pending message"
onClick={showPopover}
data-testid="claim-pending-message"
className={styles.claimBtn}
disabled={consumers.length < 2}
>
CLAIM
</EuiButton>
)

const buttonTooltip = (
<EuiToolTip
content="There is no consumer to claim the message."
position="top"
display="inlineBlock"
anchorClassName="flex-row"
>
{button}
</EuiToolTip>
)

return (
<EuiPopover
key={id}
onWheel={(e) => e.stopPropagation()}
anchorPosition="leftCenter"
ownFocus
isOpen={isOpen}
Expand All @@ -117,18 +144,7 @@ const MessageClaimPopover = (props: Props) => {
anchorClassName="claimPendingMessage"
panelClassName={styles.popoverWrapper}
closePopover={() => {}}
button={(
<EuiButton
size="s"
color="secondary"
aria-label="Claim pending message"
onClick={showPopover}
data-testid="claim-pending-message"
className={styles.claimBtn}
>
CLAIM
</EuiButton>
)}
button={consumers.length < 2 ? buttonTooltip : button}
>
<EuiForm>
<EuiFlexGroup>
Expand Down
6 changes: 6 additions & 0 deletions ...es/browser/components/stream-details/messages-view/MessageClaimPopover/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
font: normal normal normal 13px/24px Graphik;
letter-spacing: -0.13px;
color: var(--inputPlaceholderColor) !important;
white-space: nowrap;
}

.consumerOption :global(.euiContextMenu__itemLayout) .pendingCount {
Expand Down Expand Up @@ -119,3 +120,8 @@
.popoverWrapper .container .grow {
flex-grow: 2;
}

.consumerName {
overflow: hidden;
text-overflow: ellipsis;
}
12 changes: 9 additions & 3 deletions redisinsight/ui/src/slices/browser/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,9 +959,15 @@ export function claimPendingMessages(
dispatch(claimConsumerMessagesSuccess())
dispatch<any>(fetchConsumerMessages())
dispatch<any>(fetchConsumers())
dispatch(addMessageNotification(
successMessages.MESSAGE_ACTION(data.affected[0], 'claimed')
))
if (data.affected.length) {
dispatch(addMessageNotification(
successMessages.MESSAGE_ACTION(data.affected[0], 'claimed')
))
} else {
dispatch(addMessageNotification(
successMessages.NO_CLAIMED_MESSAGES()
))
}
onSuccess?.(data)
}
} catch (_err) {
Expand Down