Skip to content

fix(ui): add spacing betwen the key details in the header #5037

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 5 commits into from
Oct 7, 2025
Merged

fix(ui): add spacing betwen the key details in the header #5037

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
223401d
fix(ui): add spacing betwen the key details in the header
valkirilov Oct 6, 2025
23337a4
fix(ui): added spacing betwen action buttons in edit json key
valkirilov Oct 6, 2025
4ab02e5
fix(ui): update ttl input placement in key details header
valkirilov Oct 6, 2025
16e35f7
test(ui): fix the test utils import
valkirilov Oct 6, 2025
d55f733
fix(ui): remove additional classname
valkirilov Oct 7, 2025
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
2 changes: 1 addition & 1 deletion redisinsight/ui/src/pages/browser/modules/key-details-header/KeyDetailsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const KeyDetailsHeader = ({
align="start"
justify="between"
>
<Row>
<Row gap="l">
<KeyDetailsHeaderSizeLength width={width} />
<KeyDetailsHeaderTTL onEditTTL={handleEditTTL} />
</Row>
Expand Down
9 changes: 6 additions & 3 deletions ...wser/modules/key-details-header/components/key-details-header-ttl/KeyDetailsHeaderTTL.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,15 @@ const KeyDetailsHeaderTTL = ({ onEditTTL }: Props) => {
<Grid
columns={2}
responsive={false}
gap="none"
gap="s"
className={styles.ttlGridComponent}
data-testid="edit-ttl-grid"
>
<FlexItem>
<Text size="s" className={styles.subtitleText}>
<Text
size="s"
className={cx(styles.subtitleText, styles.subtitleTextTTL)}
>
TTL:
</Text>
</FlexItem>
Expand Down Expand Up @@ -139,7 +142,7 @@ const KeyDetailsHeaderTTL = ({ onEditTTL }: Props) => {
)}
<Text
size="s"
className={cx(styles.subtitleText, {
className={cx(styles.subtitleText, styles.subtitleTextTTL, {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since subtitleText is adding some paddings and you are removing it in subtitleTextTTL, does it make sense to remove the subtitleText class?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing it out. I thought we needed it because it comes with additional styling, but I just checked it and it works fine even without it. So, now it's removed, thanks!

[styles.hidden]: ttlIsEditing || ttlIsHovering,
})}
data-testid="key-ttl-text"
Expand Down
18 changes: 15 additions & 3 deletions ...s/browser/modules/key-details-header/components/key-details-header-ttl/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
padding: 6px 2px 6px 0;
}

.subtitleTextTTL {
height: 26px;
line-height: 26px;
padding: 0;
}

.controlsKey {
right: 25px;
}
Expand All @@ -21,21 +27,27 @@

.ttlInput {
min-width: 106px;
font-size: 13px !important;
height: 25px !important;
font-size: 12px !important;
height: 24px !important;
padding: 2px 0 0 9px !important;
}

.ttlGridComponent,
.classNameGridComponent {
position: relative;
}

.ttlGridComponent {
height: 24px;
line-height: 24px;
}

.hidden {
display: none;
}

.ttlTextValue {
padding-left: 11px;
padding-left: 14px;
}

@include global.insights-open {
Expand Down
2 changes: 1 addition & 1 deletion ...browser/modules/key-details/components/rejson-details/monaco-editor/MonacoEditor.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, screen } from '@testing-library/react'
import { render, screen } from 'uiSrc/utils/test-utils'
import { configureStore } from '@reduxjs/toolkit'
import { Provider } from 'react-redux'

Expand Down
9 changes: 5 additions & 4 deletions ...ages/browser/modules/key-details/components/rejson-details/monaco-editor/MonacoEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useRef, useState } from 'react'
import { useDispatch } from 'react-redux'
import { EuiFlexItem } from '@elastic/eui'
import { monaco } from 'react-monaco-editor'
import JSONbig from 'json-bigint'

Expand All @@ -13,6 +12,8 @@ import {
PrimaryButton,
SecondaryButton,
} from 'uiSrc/components/base/forms/buttons'
import { Row } from 'uiSrc/components/base/layout/flex'
import { Spacer } from 'uiSrc/components/base/layout'
import { BaseProps } from '../interfaces'
import { useChangeEditorType } from '../../change-editor-type-button'

Expand Down Expand Up @@ -64,8 +65,8 @@ const MonacoEditor = (props: BaseProps) => {
editorWrapperClassName={styles.editorWrapper}
onEditorDidMount={onEditorDidMount}
/>

<EuiFlexItem className={styles.actions}>
<Spacer size="m" />
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bonus Points: Not related to the changes of the popover colors, but I fixed this minimal spacing issue as well.

Before After
Image Image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, there is a related ticket so it should be closed after this. I will link it to your issue. Tnx!

<Row justify="end" gap="m" className={styles.actions}>
<SecondaryButton
onClick={switchEditorType}
data-testid="json-data-cancel-btn"
Expand All @@ -80,7 +81,7 @@ const MonacoEditor = (props: BaseProps) => {
>
Overwrite Data
</PrimaryButton>
</EuiFlexItem>
</Row>
</div>
)
}
Expand Down
40 changes: 15 additions & 25 deletions ...ght/ui/src/pages/browser/modules/key-details/components/rejson-details/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
position: relative;

input {
font-family: "Graphik", sans-serif !important;
font-family: 'Graphik', sans-serif !important;
}

:global {
Expand Down Expand Up @@ -56,7 +56,7 @@
.jsonData {
font-size: 14px;
line-height: 25px;
font-family: "Inconsolata", monospace !important;
font-family: 'Inconsolata', monospace !important;
letter-spacing: 0.15px;
flex-grow: 1;

Expand All @@ -69,7 +69,7 @@
.monacoEditorJsonData {
font-size: 14px;
line-height: 25px;
font-family: "Inconsolata", monospace !important;
font-family: 'Inconsolata', monospace !important;
letter-spacing: 0.15px;
flex-grow: 1;
width: 100%;
Expand All @@ -78,7 +78,7 @@
}

.defaultFont {
font-family: "Graphik", sans-serif !important;
font-family: 'Graphik', sans-serif !important;
}

.errorMessage {
Expand All @@ -95,7 +95,8 @@
z-index: 2;
display: flex;
align-items: center;
justify-content: center;gap:12px;
justify-content: center;
gap: 12px;
box-shadow: 0 3px 3px var(--controlsBoxShadowColor);

&.controls {
Expand Down Expand Up @@ -123,7 +124,7 @@
align-items: center;

&:before {
content: "";
content: '';
display: block;
position: absolute;
height: 100%;
Expand All @@ -142,7 +143,9 @@
background: var(--hoverInListColor);
}

> div, span, button {
> div,
span,
button {
z-index: 1;
}
}
Expand Down Expand Up @@ -189,7 +192,7 @@
.jsonValue {
font-size: 14px;
line-height: 25px;
font-family: "Inconsolata", monospace;
font-family: 'Inconsolata', monospace;
letter-spacing: 0.15px;
padding: 0 8px;
max-width: 1000px;
Expand Down Expand Up @@ -240,7 +243,8 @@
}
}

.actionButtons, .deleteBtn {
.actionButtons,
.deleteBtn {
margin-left: 1em;
display: flex;
align-items: center;
Expand Down Expand Up @@ -269,22 +273,8 @@
max-width: none;
}

.actions {
margin-top: 1em;
display: flex;
flex-direction: row !important;
width: 100%;
justify-content: flex-end;

button {

&:first-of-type {
margin-right: 1em;
}
}
}

.editor, .editorWrapper {
.editor,
.editorWrapper {
// Using 100% height starts a weird Monaco animation,
// which causes the editor to overflow its container.
// Probably it's related to the borders of the inside elements.
Expand Down
Loading