Skip to content

Commit 658d079

Browse files
authored
Merge branch 'main' into astandrik.very-bad-performance-1472
2 parents 1c88b4e + b537f54 commit 658d079

File tree

7 files changed

+29
-5
lines changed

7 files changed

+29
-5
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [6.27.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.27.0...v6.27.1) (2024-10-22)
4+
5+
6+
### Bug Fixes
7+
8+
* increase storage/groups timeout ([#1510](https://github.com/ydb-platform/ydb-embedded-ui/issues/1510)) ([b3dad05](https://github.com/ydb-platform/ydb-embedded-ui/commit/b3dad0545744ba091349c468ec5b62408dcfaff5))
9+
* remove unneeded titles ([#1508](https://github.com/ydb-platform/ydb-embedded-ui/issues/1508)) ([b4c44e9](https://github.com/ydb-platform/ydb-embedded-ui/commit/b4c44e9f668bbf3528bc156117e821d126225865))
10+
311
## [6.27.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.26.1...v6.27.0) (2024-10-21)
412

513

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ydb-embedded-ui",
3-
"version": "6.27.0",
3+
"version": "6.27.1",
44
"files": [
55
"dist"
66
],

src/containers/UserSettings/UserSettings.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ export const UserSettings = ({settings: userSettings}: UserSettingsProps) => {
1111
return (
1212
<Settings>
1313
{userSettings.map((page) => {
14-
const {id, title, icon, sections = []} = page;
14+
const {id, title, icon, sections = [], showTitle} = page;
1515

1616
return (
1717
<Settings.Page key={id} id={id} title={title} icon={icon}>
1818
{sections.map((section) => {
1919
const {title: sectionTitle, settings: sectionSettings = []} = section;
2020

2121
return (
22-
<Settings.Section key={id} title={sectionTitle}>
22+
<Settings.Section
23+
key={id}
24+
title={sectionTitle}
25+
showTitle={showTitle ?? true}
26+
>
2327
{sectionSettings.map((setting) => {
2428
if (setting.type === 'info') {
2529
return (

src/containers/UserSettings/settings.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export interface SettingsPage {
3131
title: string;
3232
icon: IconProps;
3333
sections: SettingsSection[];
34+
// default true
35+
showTitle?: false;
3436
}
3537

3638
export type YDBEmbeddedUISettings = SettingsPage[];
@@ -155,12 +157,14 @@ export const generalPage: SettingsPage = {
155157
title: i18n('page.general'),
156158
icon: {data: StarFill, height: 14, width: 14},
157159
sections: [appearanceSection],
160+
showTitle: false,
158161
};
159162
export const experimentsPage: SettingsPage = {
160163
id: 'experimentsPage',
161164
title: i18n('page.experiments'),
162165
icon: {data: Flask},
163166
sections: [experimentsSection],
167+
showTitle: false,
164168
};
165169
export const editorPage: SettingsPage = {
166170
id: 'editorPage',
@@ -174,6 +178,7 @@ export const aboutPage: SettingsPage = {
174178
title: i18n('page.about'),
175179
icon: {data: CircleInfo},
176180
sections: [aboutSettingsSection],
181+
showTitle: false,
177182
};
178183

179184
export function getUserSettings({singleClusterMode}: {singleClusterMode: boolean}) {

src/services/api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
279279
fields_required: preparedFieldsRequired,
280280
// Do not send empty string
281281
filter: filter || undefined,
282+
timeout: 20_000,
282283
...params,
283284
},
284285
{concurrentId, requestConfig: {signal}},

src/types/api/storage.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,4 +328,10 @@ export interface GroupsRequestParams extends BaseStorageRequestParams {
328328
filter_group_by?: GroupsGroupByField;
329329
filter_group?: string;
330330
fieldsRequired?: GroupsRequiredField[] | 'all';
331+
332+
/**
333+
* Backend timeout, default 10_000
334+
* 50% - BSC timeout
335+
*/
336+
timeout?: number;
331337
}

0 commit comments

Comments
 (0)