Skip to content

Commit e9bde00

Browse files
authored
Merge pull request #2044 from RedisInsight/fe/bugfix/RI-4465_RI-4464
#RI-4465 - fix multiple tooltips
2 parents 8d91596 + 78d13f9 commit e9bde00

File tree

6 files changed

+31
-17
lines changed

6 files changed

+31
-17
lines changed

redisinsight/ui/src/components/notifications/styles.module.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
:global(.euiFlexItem:not(:last-child)) {
2525
margin-right: 14px !important;
2626
}
27+
2728
.summaryValue {
2829
font-size: 14px;
2930
font-weight: 500;
3031
}
32+
33+
.summaryLabel {
34+
color: var(--euiToastLightColor) !important;
35+
}
3136
}

redisinsight/ui/src/components/notifications/success-messages.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export default {
163163
<>
164164
Action completed
165165
<br />
166-
<EuiText>Data uploaded with file: {formatLongName(fileName, 24, 5)}</EuiText>
166+
<EuiText color="ghost">Data uploaded with file: {formatLongName(fileName, 24, 5)}</EuiText>
167167
</>
168168
),
169169
message: (
@@ -175,20 +175,20 @@ export default {
175175
className={styles.summary}
176176
>
177177
<EuiFlexItem grow={false}>
178-
<EuiText className={styles.summaryValue}>{numberWithSpaces(processed)}</EuiText>
179-
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Commands Processed</EuiText>
178+
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(processed)}</EuiText>
179+
<EuiText size="xs" className={styles.summaryLabel}>Commands Processed</EuiText>
180180
</EuiFlexItem>
181181
<EuiFlexItem grow={false}>
182-
<EuiText className={styles.summaryValue}>{numberWithSpaces(succeed)}</EuiText>
183-
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Success</EuiText>
182+
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(succeed)}</EuiText>
183+
<EuiText size="xs" className={styles.summaryLabel}>Success</EuiText>
184184
</EuiFlexItem>
185185
<EuiFlexItem grow={false}>
186-
<EuiText className={styles.summaryValue}>{numberWithSpaces(failed)}</EuiText>
187-
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Errors</EuiText>
186+
<EuiText color="ghost" className={styles.summaryValue}>{numberWithSpaces(failed)}</EuiText>
187+
<EuiText size="xs" className={styles.summaryLabel}>Errors</EuiText>
188188
</EuiFlexItem>
189189
<EuiFlexItem grow={false}>
190-
<EuiText className={styles.summaryValue}>{millisecondsFormat(data?.duration || 0, 'H:mm:ss.SSS')}</EuiText>
191-
<EuiText size="xs" color="subdued" className={styles.summaryLabel}>Time Taken</EuiText>
190+
<EuiText color="ghost" className={styles.summaryValue}>{millisecondsFormat(data?.duration || 0, 'H:mm:ss.SSS')}</EuiText>
191+
<EuiText size="xs" className={styles.summaryLabel}>Time Taken</EuiText>
192192
</EuiFlexItem>
193193
</EuiFlexGroup>
194194
),

redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/RedisUploadButton/RedisUploadButton.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ const RedisUploadButton = ({ label, path }: Props) => {
3030
}, [pathsInProgress])
3131

3232
const openPopover = () => {
33-
setIsPopoverOpen(true)
34-
sendEventTelemetry({
35-
event: TelemetryEvent.WORKBENCH_ENABLEMENT_AREA_DATA_UPLOAD_CLICKED,
36-
eventData: {
37-
databaseId: instanceId
38-
}
39-
})
33+
if (!isPopoverOpen) {
34+
sendEventTelemetry({
35+
event: TelemetryEvent.WORKBENCH_ENABLEMENT_AREA_DATA_UPLOAD_CLICKED,
36+
eventData: {
37+
databaseId: instanceId
38+
}
39+
})
40+
}
41+
42+
setIsPopoverOpen((v) => !v)
4043
}
4144

4245
const uploadData = async () => {

redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/RedisUploadButton/styles.module.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727

2828
.panelPopover {
2929
border-color: var(--euiColorPrimary) !important;
30-
:global(.euiPopover__panelArrow:before) {
30+
:global(.euiPopover__panelArrow--bottom:before) {
3131
border-bottom-color: var(--euiColorPrimary) !important;
3232
}
33+
34+
:global(.euiPopover__panelArrow--top:before) {
35+
border-top-color: var(--euiColorPrimary) !important;
36+
}
3337
}
3438

3539
.popoverAnchor {

redisinsight/ui/src/styles/themes/dark_theme/_dark_theme.lazy.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
--euiToastSuccessBorderColor: #{$euiToastSuccessBorderColor};
7474
--euiToastDangerBtnColor: #{$euiToastDangerBtnColor};
7575
--euiToastDangerBorderColor: #{$euiToastDangerBorderColor};
76+
--euiToastLightColor: #{$euiColorDarkShade};
7677

7778
// Custom
7879
--htmlColor: #{$htmlColor};

redisinsight/ui/src/styles/themes/light_theme/_light_theme.lazy.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
--euiToastSuccessBorderColor: #{$euiToastSuccessBorderColor};
7575
--euiToastDangerBtnColor: #{$euiToastDangerBtnColor};
7676
--euiToastDangerBorderColor: #{$euiToastDangerBorderColor};
77+
--euiToastLightColor: #{$euiColorLightestShade};
7778

7879
// Custom
7980
--htmlColor: #{$htmlColor};

0 commit comments

Comments
 (0)