Skip to content

feat: save storage type in user settings #3160

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
Raubzeug merged 3 commits into from
Dec 4, 2025
Merged

feat: save storage type in user settings #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48ac638
feat: save storage type in user settings
Raubzeug Dec 3, 2025
301a2a5
fix: ai review
Raubzeug Dec 3, 2025
95d276b
fix: ai review
Raubzeug Dec 3, 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
3 changes: 2 additions & 1 deletion src/containers/Storage/PaginatedStorage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedT
import {PaginatedStorageGroups} from './PaginatedStorageGroups';
import {PaginatedStorageNodes} from './PaginatedStorageNodes';
import type {StorageViewContext} from './types';
import {useStorageQueryParams} from './useStorageQueryParams';
import {useSaveStorageType, useStorageQueryParams} from './useStorageQueryParams';
import {getStorageGroupsInitialEntitiesCount, getStorageNodesInitialEntitiesCount} from './utils';

export interface PaginatedStorageProps {
Expand All @@ -21,6 +21,7 @@ export interface PaginatedStorageProps {

export const PaginatedStorage = (props: PaginatedStorageProps) => {
const {storageType} = useStorageQueryParams();
useSaveStorageType();
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();

const isNodes = storageType === 'nodes';
Expand Down
41 changes: 36 additions & 5 deletions src/containers/Storage/useStorageQueryParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import React from 'react';

import {StringParam, useQueryParams} from 'use-query-params';
import {StringParam, useQueryParam, useQueryParams} from 'use-query-params';

import {SETTING_KEYS} from '../../store/reducers/settings/constants';
import {STORAGE_TYPES} from '../../store/reducers/storage/constants';
import type {StorageType, VisibleEntities} from '../../store/reducers/storage/types';
import {storageTypeSchema, visibleEntitiesSchema} from '../../store/reducers/storage/types';
import {useSetting} from '../../utils/hooks';
import {NodesUptimeFilterValues, nodesUptimeFilterValuesSchema} from '../../utils/nodes';

import {storageGroupsGroupByParamSchema} from './PaginatedStorageGroupsTable/columns/constants';
Expand All @@ -22,6 +25,11 @@ export function useStorageQueryParams() {
storageGroupsGroupBy: StringParam,
});

const [_savedStorageType, setSavedStorageType] = useSetting<StorageType>(
SETTING_KEYS.STORAGE_TYPE,
STORAGE_TYPES.groups,
);

const storageType = storageTypeSchema.parse(queryParams.type);

const visibleEntities = visibleEntitiesSchema.parse(queryParams.visible);
Expand All @@ -42,7 +50,7 @@ export function useStorageQueryParams() {
patch[STORAGE_SEARCH_PARAM_BY_TYPE[storageType]] = queryParams.search;
setQueryParams(patch, 'replaceIn');
}
}, [queryParams.search, storageType]);
}, [queryParams.search, storageType, setQueryParams]);

const handleTextFilterGroupsChange = (value: string) => {
setQueryParams({groupsSearch: value || undefined}, 'replaceIn');
Expand All @@ -56,9 +64,13 @@ export function useStorageQueryParams() {
setQueryParams({visible: value}, 'replaceIn');
};

const handleStorageTypeChange = (value: StorageType) => {
setQueryParams({type: value}, 'replaceIn');
};
const handleStorageTypeChange = React.useCallback(
(value: StorageType) => {
setQueryParams({type: value}, 'replaceIn');
setSavedStorageType(value);
},
[setQueryParams, setSavedStorageType],
);

const handleUptimeFilterChange = (value: NodesUptimeFilterValues) => {
setQueryParams({uptimeFilter: value}, 'replaceIn');
Expand Down Expand Up @@ -103,3 +115,22 @@ export function useStorageQueryParams() {
handleShowAllNodes,
};
}

export function useSaveStorageType() {
const [queryStorageType, setQueryStorageType] = useQueryParam('type', StringParam);
const [savedStorageType] = useSetting<StorageType>(
SETTING_KEYS.STORAGE_TYPE,
STORAGE_TYPES.groups,
);

const normalizedStorageType = React.useMemo(
() => storageTypeSchema.parse(queryStorageType ?? savedStorageType),
[queryStorageType, savedStorageType],
);

React.useEffect(() => {
if (normalizedStorageType !== queryStorageType) {
setQueryStorageType(normalizedStorageType);
}
Comment on lines +132 to +134
Copy link
Member

@artemmufazalov artemmufazalov Dec 3, 2025

Choose a reason for hiding this comment

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

Is it possible to get to table with specific storage type in query? With your code in such case storage type from query will always be replaced with the saved one.

I think it should be two ways sync like here: https://github.com/ydb-platform/ydb-embedded-ui/blob/main/src/containers/Tenant/TenantNavigation/useTenantNavigation.tsx#L60

Copy link
Contributor Author

@Raubzeug Raubzeug Dec 3, 2025

Choose a reason for hiding this comment

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

No, normalizedStorageType calculates with storageTypeSchema.parse(queryStorageType ?? savedStorageType). So, queryStorageType has priority and will be taken, if it is presented.

}, [normalizedStorageType, queryStorageType, setQueryStorageType]);
}
3 changes: 3 additions & 0 deletions src/store/reducers/settings/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {ValueOf} from '../../../types/common';
import {AclSyntax} from '../../../utils/constants';
import {Lang} from '../../../utils/i18n';
import {DEFAULT_QUERY_SETTINGS, QUERY_ACTIONS} from '../../../utils/query';
import {STORAGE_TYPES} from '../storage/constants';
import {TENANT_PAGES_IDS} from '../tenant/constants';

import type {SettingOptions} from './types';
Expand Down Expand Up @@ -36,6 +37,7 @@ export const SETTING_KEYS = {
QUERY_SETTINGS_BANNER_LAST_CLOSED: 'querySettingsBannerLastClosed',
QUERY_EXECUTION_SETTINGS: 'queryExecutionSettings',
ACL_SYNTAX: 'aclSyntax',
STORAGE_TYPE: 'storageType',
} as const;

export type SettingKey = ValueOf<typeof SETTING_KEYS>;
Expand Down Expand Up @@ -71,6 +73,7 @@ export const DEFAULT_USER_SETTINGS = {
[SETTING_KEYS.QUERY_SETTINGS_BANNER_LAST_CLOSED]: undefined,
[SETTING_KEYS.QUERY_EXECUTION_SETTINGS]: DEFAULT_QUERY_SETTINGS,
[SETTING_KEYS.ACL_SYNTAX]: AclSyntax.YdbShort,
[SETTING_KEYS.STORAGE_TYPE]: STORAGE_TYPES.groups,
} as const satisfies Record<SettingKey, unknown>;

export const SETTINGS_OPTIONS: Record<string, SettingOptions> = {
Expand Down
Loading