Skip to content

fix(UserSettings): show description under setting control #1827

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
Jan 16, 2025
Merged

fix(UserSettings): show description under setting control #1827

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
518b361
fix(UserSettings): show description under setting contorol
Raubzeug Jan 16, 2025
9303052
fix: tests
Raubzeug Jan 16, 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
11 changes: 10 additions & 1 deletion src/containers/UserSettings/UserSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Settings} from '@gravity-ui/navigation';
import {Text} from '@gravity-ui/uikit';

import {Setting} from './Setting';
import type {YDBEmbeddedUISettings} from './settings';
Expand Down Expand Up @@ -32,9 +33,17 @@ export const UserSettings = ({settings: userSettings}: UserSettingsProps) => {
</Settings.Item>
);
}
const {description, ...rest} = setting;
return (
<Settings.Item key={setting.title} {...setting}>
<Settings.Item
key={setting.title}
align="top"
{...rest}
>
<Setting {...setting} />
<Text color="secondary" as="div">
{description}
</Text>
Comment on lines +38 to +46
Copy link
Member

@artemmufazalov artemmufazalov Jan 16, 2025

Choose a reason for hiding this comment

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

A margin between setting control and text is needed

Screenshot 2025-01-16 at 17 39 27

Copy link
Contributor Author

@Raubzeug Raubzeug Jan 16, 2025

Choose a reason for hiding this comment

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

I'm not sure... I've looked at navigation stories, and there's no additional space between control and text: https://preview.yandexcloud.dev/navigation/?path=/story/components-settings--showcase (see "Communication" tabl)

</Settings.Item>
);
})}
Expand Down
1 change: 1 addition & 0 deletions tests/suites/tenant/summary/objectSummary.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ test.describe('Object Summary', async () => {
'WriteAttributes',
'CreateDirectory',
'CreateTable',
'CreateQueue',
'RemoveSchema',
'AlterSchema',
],
Expand Down
Loading