Skip to content

Commit 957e1fa

Browse files
authored
fix: rename flag for display metrics cards for database diagnostics (#536)
1 parent 12d4fef commit 957e1fa

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {EPathType} from '../../../../types/api/schema';
88
import type {AdditionalTenantsProps} from '../../../../types/additionalProps';
99
import {Icon} from '../../../../components/Icon';
1010
import {useSetting} from '../../../../utils/hooks';
11-
import {ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN} from '../../../../utils/constants';
11+
import {DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS} from '../../../../utils/constants';
1212
import Overview from '../Overview/Overview';
1313
import {Healthcheck} from '../OldHealthcheck';
1414
import {TenantOverview} from '../TenantOverview/TenantOverview';
@@ -32,7 +32,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
3232

3333
const {currentSchemaPath} = useSelector((state: any) => state.schema);
3434

35-
const [newTenantDiagnostics] = useSetting(ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN);
35+
const [displayMetricsCards] = useSetting(DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS);
3636

3737
const openModalHandler = () => {
3838
setIsModalVisible(true);
@@ -59,7 +59,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
5959
};
6060

6161
const renderTenantOverview = () => {
62-
if (newTenantDiagnostics) {
62+
if (displayMetricsCards) {
6363
return (
6464
<div className={b('section')}>
6565
<TenantOverview

src/containers/UserSettings/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
"settings.enableAdditionalQueryModes.title": "Enable additional query modes",
2626
"settings.enableAdditionalQueryModes.popover": "Adds 'Data', 'YQL - QueryService' and 'PostgreSQL' modes. May not work on some versions",
2727

28-
"settings.tenantDiagnostics.title": "Enable new database diagnostics design",
28+
"settings.tenantDiagnostics.title": "Display metrics cards for database diagnostics",
2929
"settings.tenantDiagnostics.popover": "Adds indicators of database resources usage. Incomplete data may be displayed for some databases"
3030
}

src/containers/UserSettings/i18n/ru.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
"settings.enableAdditionalQueryModes.title": "Включить дополнительные режимы выполнения запросов",
2626
"settings.enableAdditionalQueryModes.popover": "Добавляет режимы 'Data', 'YQL - QueryService' и 'PostgreSQL'. Может работать некорректно на некоторых версиях",
2727

28-
"settings.tenantDiagnostics.title": "Включить новый дизайн для диагностики баз данных",
28+
"settings.tenantDiagnostics.title": "Показывать карточки с метриками в диагностике базы данных",
2929
"settings.tenantDiagnostics.popover": "Добавляет индикаторы использования ресурсов базы данных. Для некоторых баз могут отображаться неполные данные"
3030
}

src/containers/UserSettings/settings.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import flaskIcon from '../../assets/icons/flask.svg';
55

66
import {
77
ENABLE_ADDITIONAL_QUERY_MODES,
8-
ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN,
8+
DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS,
99
INVERTED_DISKS_KEY,
1010
LANGUAGE_KEY,
1111
THEME_KEY,
@@ -96,7 +96,7 @@ export const enableQueryModesForExplainSetting: SettingProps = {
9696
helpPopoverContent: i18n('settings.enableAdditionalQueryModes.popover'),
9797
};
9898
export const enableNewTenantDiagnosticsDesign: SettingProps = {
99-
settingKey: ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN,
99+
settingKey: DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS,
100100
title: i18n('settings.tenantDiagnostics.title'),
101101
helpPopoverContent: i18n('settings.tenantDiagnostics.popover'),
102102
};

src/store/reducers/settings/settings.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
LAST_USED_QUERY_ACTION_KEY,
1616
USE_BACKEND_PARAMS_FOR_TABLES_KEY,
1717
LANGUAGE_KEY,
18-
ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN,
18+
DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS,
1919
} from '../../../utils/constants';
2020
import '../../../services/api';
2121
import {parseJson} from '../../../utils/utils';
@@ -56,8 +56,8 @@ export const initialState = {
5656
ENABLE_ADDITIONAL_QUERY_MODES,
5757
'false',
5858
),
59-
[ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN]: readSavedSettingsValue(
60-
ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN,
59+
[DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS]: readSavedSettingsValue(
60+
DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS,
6161
'false',
6262
),
6363
[SAVED_QUERIES_KEY]: readSavedSettingsValue(SAVED_QUERIES_KEY, '[]'),

src/utils/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ export const LANGUAGE_KEY = 'language';
8888
export const INVERTED_DISKS_KEY = 'invertedDisks';
8989
export const USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY = 'useNodesEndpointInDiagnostics';
9090
export const ENABLE_ADDITIONAL_QUERY_MODES = 'enableAdditionalQueryModes';
91-
export const ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN = 'enableNewTenantDiagnosticsDesign';
91+
// Remain key name "enableNewTenantDiagnosticsDesign" for backward compatibility
92+
export const DISPLAY_METRICS_CARDS_FOR_TENANT_DIAGNOSTICS = 'enableNewTenantDiagnosticsDesign';
9293
export const SAVED_QUERIES_KEY = 'saved_queries';
9394
export const ASIDE_HEADER_COMPACT_KEY = 'asideHeaderCompact';
9495
export const QUERIES_HISTORY_KEY = 'queries_history';

0 commit comments

Comments
 (0)