Skip to content

#RI-4465 - fix multiple tooltips #2044

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
May 1, 2023
Merged

#RI-4465 - fix multiple tooltips #2044

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
5 changes: 5 additions & 0 deletions redisinsight/ui/src/components/notifications/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,13 @@
:global(.euiFlexItem:not(:last-child)) {
margin-right: 14px !important;
}

.summaryValue {
font-size: 14px;
font-weight: 500;
}

.summaryLabel {
color: var(--euiToastLightColor) !important;
}
}
18 changes: 9 additions & 9 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 @@ -163,7 +163,7 @@ export default {
<>
Action completed
<br />
<EuiText>Data uploaded with file: {formatLongName(fileName, 24, 5)}</EuiText>
<EuiText color="ghost">Data uploaded with file: {formatLongName(fileName, 24, 5)}</EuiText>
</>
),
message: (
Expand All @@ -175,20 +175,20 @@ export default {
className={styles.summary}
>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{numberWithSpaces(processed)}</EuiText>
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Commands Processed</EuiText>
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(processed)}</EuiText>
<EuiText size="xs" className={styles.summaryLabel}>Commands Processed</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{numberWithSpaces(succeed)}</EuiText>
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Success</EuiText>
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(succeed)}</EuiText>
<EuiText size="xs" className={styles.summaryLabel}>Success</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{numberWithSpaces(failed)}</EuiText>
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Errors</EuiText>
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(failed)}</EuiText>
<EuiText size="xs" className={styles.summaryLabel}>Errors</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText className={styles.summaryValue}>{millisecondsFormat(data?.duration || 0, 'H:mm:ss.SSS')}</EuiText>
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Time Taken</EuiText>
<EuiText color="ghost" className={styles.summaryValue}>{millisecondsFormat(data?.duration || 0, 'H:mm:ss.SSS')}</EuiText>
<EuiText size="xs" className={styles.summaryLabel}>Time Taken</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
),
Expand Down
17 changes: 10 additions & 7 deletions ...ponents/enablement-area/EnablementArea/components/RedisUploadButton/RedisUploadButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ const RedisUploadButton = ({ label, path }: Props) => {
}, [pathsInProgress])

const openPopover = () => {
setIsPopoverOpen(true)
sendEventTelemetry({
event: TelemetryEvent.WORKBENCH_ENABLEMENT_AREA_DATA_UPLOAD_CLICKED,
eventData: {
databaseId: instanceId
}
})
if (!isPopoverOpen) {
sendEventTelemetry({
event: TelemetryEvent.WORKBENCH_ENABLEMENT_AREA_DATA_UPLOAD_CLICKED,
eventData: {
databaseId: instanceId
}
})
}

setIsPopoverOpen((v) => !v)
}

const uploadData = async () => {
Expand Down
6 changes: 5 additions & 1 deletion ...components/enablement-area/EnablementArea/components/RedisUploadButton/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@

.panelPopover {
border-color: var(--euiColorPrimary) !important;
:global(.euiPopover__panelArrow:before) {
:global(.euiPopover__panelArrow--bottom:before) {
border-bottom-color: var(--euiColorPrimary) !important;
}

:global(.euiPopover__panelArrow--top:before) {
border-top-color: var(--euiColorPrimary) !important;
}
}

.popoverAnchor {
Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/styles/themes/dark_theme/_dark_theme.lazy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
--euiToastSuccessBorderColor: #{$euiToastSuccessBorderColor};
--euiToastDangerBtnColor: #{$euiToastDangerBtnColor};
--euiToastDangerBorderColor: #{$euiToastDangerBorderColor};
--euiToastLightColor: #{$euiColorDarkShade};

// Custom
--htmlColor: #{$htmlColor};
Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/styles/themes/light_theme/_light_theme.lazy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
--euiToastSuccessBorderColor: #{$euiToastSuccessBorderColor};
--euiToastDangerBtnColor: #{$euiToastDangerBtnColor};
--euiToastDangerBorderColor: #{$euiToastDangerBorderColor};
--euiToastLightColor: #{$euiColorLightestShade};

// Custom
--htmlColor: #{$htmlColor};
Expand Down