fix(Nodes): pass database param to nodes api handler (#1197)

ValeraS · web-flow · commit 345600ff227e · 2024-08-21T16:17:42.000+02:00
diff --git a/src/containers/Nodes/Nodes.tsx b/src/containers/Nodes/Nodes.tsx
@@ -49,10 +49,11 @@ const b = cn('ydb-nodes');
 
 interface NodesProps {
     path?: string;
+    database?: string;
     additionalNodesProps?: AdditionalNodesProps;
 }
 
-export const Nodes = ({path, additionalNodesProps = {}}: NodesProps) => {
+export const Nodes = ({path, database, additionalNodesProps = {}}: NodesProps) => {
     const [queryParams, setQueryParams] = useQueryParams({
         uptimeFilter: StringParam,
         search: StringParam,
@@ -69,9 +70,12 @@ export const Nodes = ({path, additionalNodesProps = {}}: NodesProps) => {
 
     // If there is no path, it's cluster Nodes tab
     const useGetComputeNodes = path && !useNodesEndpoint;
-    const nodesQuery = nodesApi.useGetNodesQuery(useGetComputeNodes ? skipToken : {path}, {
-        pollingInterval: autoRefreshInterval,
-    });
+    const nodesQuery = nodesApi.useGetNodesQuery(
+        useGetComputeNodes ? skipToken : {path, database},
+        {
+            pollingInterval: autoRefreshInterval,
+        },
+    );
     const computeQuery = nodesApi.useGetComputeNodesQuery(useGetComputeNodes ? {path} : skipToken, {
         pollingInterval: autoRefreshInterval,
     });
diff --git a/src/containers/Nodes/NodesWrapper.tsx b/src/containers/Nodes/NodesWrapper.tsx
@@ -7,6 +7,7 @@ import {PaginatedNodes} from './PaginatedNodes';
 
 interface NodesWrapperProps {
     path?: string;
+    database?: string;
     parentContainer?: Element | null;
     additionalNodesProps?: AdditionalNodesProps;
 }
diff --git a/src/containers/Nodes/PaginatedNodes.tsx b/src/containers/Nodes/PaginatedNodes.tsx
@@ -42,11 +42,17 @@ const b = cn('ydb-nodes');
 
 interface NodesProps {
     path?: string;
+    database?: string;
     parentContainer?: Element | null;
     additionalNodesProps?: AdditionalNodesProps;
 }
 
-export const PaginatedNodes = ({path, parentContainer, additionalNodesProps}: NodesProps) => {
+export const PaginatedNodes = ({
+    path,
+    database,
+    parentContainer,
+    additionalNodesProps,
+}: NodesProps) => {
     const [queryParams, setQueryParams] = useQueryParams({
         uptimeFilter: StringParam,
         search: StringParam,
@@ -59,8 +65,8 @@ export const PaginatedNodes = ({path, parentContainer, additionalNodesProps}: No
     const problemFilter = useTypedSelector(selectProblemFilter);
 
     const tableFilters = React.useMemo(() => {
-        return {path, searchValue, problemFilter, uptimeFilter};
-    }, [path, searchValue, problemFilter, uptimeFilter]);
+        return {path, database, searchValue, problemFilter, uptimeFilter};
+    }, [path, database, searchValue, problemFilter, uptimeFilter]);
 
     const getRowClassName: GetRowClassName<NodesPreparedEntity> = (row) => {
         return b('node', {unavailable: isUnavailableNode(row)});
diff --git a/src/containers/Nodes/getNodes.ts b/src/containers/Nodes/getNodes.ts
@@ -28,7 +28,7 @@ export const getNodes: FetchData<
     } = params;
 
     const {sortOrder, columnId} = sortParams ?? {};
-    const {path, searchValue, problemFilter, uptimeFilter} = filters ?? {};
+    const {path, database, searchValue, problemFilter, uptimeFilter} = filters ?? {};
 
     const response = await window.api.getNodes(
         {
@@ -40,6 +40,7 @@ export const getNodes: FetchData<
             sortOrder,
             sortValue: columnId as NodesSortValue,
             path,
+            database,
             filter: searchValue,
             problems_only: getProblemParamValue(problemFilter),
             uptime: getUptimeParamValue(uptimeFilter),
diff --git a/src/containers/Storage/PaginatedStorage.tsx b/src/containers/Storage/PaginatedStorage.tsx
@@ -16,14 +16,14 @@ import {PaginatedStorageGroups} from './StorageGroups/PaginatedStorageGroups';
 import {PaginatedStorageNodes} from './StorageNodes/PaginatedStorageNodes';
 
 interface PaginatedStorageProps {
-    tenant?: string;
+    database?: string;
     nodeId?: string;
     parentContainer?: Element | null;
     additionalNodesProps?: AdditionalNodesProps;
 }
 
 export const PaginatedStorage = ({
-    tenant,
+    database,
     nodeId,
     parentContainer,
     additionalNodesProps,
@@ -105,7 +105,7 @@ export const PaginatedStorage = ({
                 searchValue={searchValue}
                 visibleEntities={visibleEntities}
                 nodesUptimeFilter={nodesUptimeFilter}
-                tenant={tenant}
+                database={database}
                 additionalNodesProps={additionalNodesProps}
                 onShowAll={handleShowAllNodes}
                 parentContainer={parentContainer}
@@ -119,7 +119,7 @@ export const PaginatedStorage = ({
         <PaginatedStorageGroups
             searchValue={searchValue}
             visibleEntities={visibleEntities}
-            tenant={tenant}
+            database={database}
             nodeId={nodeId}
             nodesMap={nodesMap}
             onShowAll={handleShowAllGroups}
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
@@ -53,11 +53,11 @@ const UsageFilterParam = withDefault(
 
 interface StorageProps {
     additionalNodesProps?: AdditionalNodesProps;
-    tenant?: string;
+    database?: string;
     nodeId?: string;
 }
 
-export const Storage = ({additionalNodesProps, tenant, nodeId}: StorageProps) => {
+export const Storage = ({additionalNodesProps, database, nodeId}: StorageProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const [queryParams, setQueryParams] = useQueryParams({
         type: StringParam,
@@ -91,14 +91,14 @@ export const Storage = ({additionalNodesProps, tenant, nodeId}: StorageProps) =>
     const storageType = isNodePage ? STORAGE_TYPES.groups : type;
 
     const nodesQuery = storageApi.useGetStorageNodesInfoQuery(
-        {tenant, visibleEntities},
+        {database, visibleEntities},
         {
             skip: storageType !== STORAGE_TYPES.nodes,
             pollingInterval: autoRefreshInterval,
         },
     );
     const groupsQuery = storageApi.useGetStorageGroupsInfoQuery(
-        {tenant, visibleEntities, nodeId},
+        {database, visibleEntities, nodeId},
         {
             skip: storageType !== STORAGE_TYPES.groups,
             pollingInterval: autoRefreshInterval,
diff --git a/src/containers/Storage/StorageGroups/PaginatedStorageGroups.tsx b/src/containers/Storage/StorageGroups/PaginatedStorageGroups.tsx
@@ -17,7 +17,7 @@ import i18n from './i18n';
 interface PaginatedStorageGroupsProps {
     searchValue: string;
     visibleEntities: VisibleEntities;
-    tenant?: string;
+    database?: string;
     nodeId?: string;
     nodesMap?: NodesMap;
 
@@ -31,7 +31,7 @@ interface PaginatedStorageGroupsProps {
 export const PaginatedStorageGroups = ({
     searchValue,
     visibleEntities,
-    tenant,
+    database,
     nodeId,
     nodesMap,
     onShowAll,
@@ -40,8 +40,8 @@ export const PaginatedStorageGroups = ({
     renderErrorMessage,
 }: PaginatedStorageGroupsProps) => {
     const tableFilters = React.useMemo(() => {
-        return {searchValue, visibleEntities, tenant, nodeId};
-    }, [searchValue, visibleEntities, tenant, nodeId]);
+        return {searchValue, visibleEntities, database, nodeId};
+    }, [searchValue, visibleEntities, database, nodeId]);
 
     const columns = React.useMemo(() => {
         return getPreparedStorageGroupsColumns(nodesMap, visibleEntities);
diff --git a/src/containers/Storage/StorageGroups/getGroups.ts b/src/containers/Storage/StorageGroups/getGroups.ts
@@ -17,7 +17,7 @@ export const getStorageGroups: FetchData<
 > = async (params) => {
     const {limit, offset, sortParams, filters} = params;
     const {sortOrder, columnId} = sortParams ?? {};
-    const {searchValue, visibleEntities, tenant, nodeId} = filters ?? {};
+    const {searchValue, visibleEntities, database, nodeId} = filters ?? {};
 
     const response = await window.api.getStorageInfo(
         {
@@ -28,7 +28,7 @@ export const getStorageGroups: FetchData<
             sortValue: columnId as StorageSortValue,
             filter: searchValue,
             visibleEntities,
-            tenant,
+            database,
             nodeId,
         },
         {concurrentId: getConcurrentId(limit, offset)},
diff --git a/src/containers/Storage/StorageNodes/PaginatedStorageNodes.tsx b/src/containers/Storage/StorageNodes/PaginatedStorageNodes.tsx
@@ -20,7 +20,7 @@ interface PaginatedStorageNodesProps {
     searchValue: string;
     visibleEntities: VisibleEntities;
     nodesUptimeFilter: NodesUptimeFilterValues;
-    tenant?: string;
+    database?: string;
 
     additionalNodesProps?: AdditionalNodesProps;
     onShowAll: VoidFunction;
@@ -34,16 +34,16 @@ export const PaginatedStorageNodes = ({
     searchValue,
     visibleEntities,
     nodesUptimeFilter,
-    tenant,
+    database,
     additionalNodesProps,
     onShowAll,
     parentContainer,
     renderControls,
     renderErrorMessage,
 }: PaginatedStorageNodesProps) => {
     const tableFilters = React.useMemo(() => {
-        return {searchValue, visibleEntities, nodesUptimeFilter, tenant};
-    }, [searchValue, visibleEntities, nodesUptimeFilter, tenant]);
+        return {searchValue, visibleEntities, nodesUptimeFilter, database};
+    }, [searchValue, visibleEntities, nodesUptimeFilter, database]);
 
     const columns = React.useMemo(() => {
         return getPreparedStorageNodesColumns(additionalNodesProps, visibleEntities);
diff --git a/src/containers/Storage/StorageNodes/getNodes.ts b/src/containers/Storage/StorageNodes/getNodes.ts
@@ -18,7 +18,7 @@ export const getStorageNodes: FetchData<
     Pick<NodesApiRequestParams, 'type' | 'storage'>
 > = async (params) => {
     const {type = 'static', storage = true, limit, offset, sortParams, filters} = params;
-    const {searchValue, nodesUptimeFilter, visibleEntities, tenant} = filters ?? {};
+    const {searchValue, nodesUptimeFilter, visibleEntities, database} = filters ?? {};
     const {sortOrder, columnId} = sortParams ?? {};
 
     const response = await window.api.getNodes(
@@ -32,7 +32,7 @@ export const getStorageNodes: FetchData<
             filter: searchValue,
             uptime: getUptimeParamValue(nodesUptimeFilter),
             visibleEntities,
-            tenant,
+            database,
         },
         {concurrentId: getConcurrentId(limit, offset)},
     );
diff --git a/src/containers/Storage/StorageWrapper.tsx b/src/containers/Storage/StorageWrapper.tsx
@@ -6,7 +6,7 @@ import {PaginatedStorage} from './PaginatedStorage';
 import {Storage} from './Storage';
 
 interface StorageWrapperProps {
-    tenant?: string;
+    database?: string;
     nodeId?: string;
     parentContainer?: Element | null;
     additionalNodesProps?: AdditionalNodesProps;
diff --git a/src/containers/Tenant/Diagnostics/Diagnostics.tsx b/src/containers/Tenant/Diagnostics/Diagnostics.tsx
@@ -101,6 +101,7 @@ function Diagnostics(props: DiagnosticsProps) {
                 return (
                     <NodesWrapper
                         path={path}
+                        database={tenantName}
                         additionalNodesProps={props.additionalNodesProps}
                         parentContainer={container.current}
                     />
@@ -110,7 +111,7 @@ function Diagnostics(props: DiagnosticsProps) {
                 return <Tablets path={path} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.storage: {
-                return <StorageWrapper tenant={tenantName} parentContainer={container.current} />;
+                return <StorageWrapper database={tenantName} parentContainer={container.current} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.network: {
                 return <Network tenantName={tenantName} />;
diff --git a/src/services/api.ts b/src/services/api.ts
@@ -159,7 +159,16 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
 
         return this.get<TNodesInfo>(
             this.getPath('/viewer/json/nodes?enums=true'),
-            {with: visibleEntities, type, tablets, sort, database: params.tenant, ...params},
+            {
+                with: visibleEntities,
+                type,
+                tablets,
+                sort,
+                ...params,
+                // TODO: remove after remove tenant param
+                database: params.database || params.tenant,
+                tenant: params.tenant || params.database,
+            },
             {concurrentId, requestConfig: {signal}},
         );
     }
@@ -179,6 +188,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
     getStorageInfo(
         {
             tenant,
+            database,
             visibleEntities,
             nodeId,
             poolName,
@@ -194,8 +204,8 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
         return this.get<TStorageInfo>(
             this.getPath(`/viewer/json/storage?enums=true`),
             {
-                database: tenant,
-                tenant,
+                database: database || tenant,
+                tenant: tenant || database,
                 node_id: nodeId,
                 pool: poolName,
                 group_id: groupId,
diff --git a/src/store/reducers/nodes/types.ts b/src/store/reducers/nodes/types.ts
@@ -54,6 +54,7 @@ export interface NodesFilters {
     problemFilter: ProblemFilterValue;
     uptimeFilter: NodesUptimeFilterValues;
     path?: string;
+    database?: string;
 }
 
 export interface NodesGeneralRequestParams extends Partial<NodesSortParams> {
@@ -68,6 +69,8 @@ export interface NodesGeneralRequestParams extends Partial<NodesSortParams> {
 export interface NodesApiRequestParams extends NodesGeneralRequestParams {
     node_id?: number | string; // get only specific node
     path?: string;
+    database?: string;
+    /** @deprecated use database instead */
     tenant?: string;
     type?: NodeType;
     visibleEntities?: VisibleEntities; // "with" param
diff --git a/src/store/reducers/storage/types.ts b/src/store/reducers/storage/types.ts
@@ -18,7 +18,7 @@ export interface PreparedStorageNodeFilters {
     searchValue: string;
     nodesUptimeFilter: NodesUptimeFilterValues;
     visibleEntities: VisibleEntities;
-    tenant?: string;
+    database?: string;
 }
 
 export interface PreparedStorageNode extends TSystemStateInfo {
@@ -36,7 +36,7 @@ export interface PreparedStorageNode extends TSystemStateInfo {
 export interface PreparedStorageGroupFilters {
     searchValue: string;
     visibleEntities: VisibleEntities;
-    tenant?: string;
+    database?: string;
     nodeId?: string;
 }
 
@@ -74,7 +74,9 @@ export interface StorageSortAndFilterParams extends Partial<StorageSortParams> {
 }
 
 export interface StorageApiRequestParams extends StorageSortAndFilterParams {
+    /** @deprecated use database instead */
     tenant?: string;
+    database?: string;
     nodeId?: string | number;
     poolName?: string;
     groupId?: string | number;

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import {PaginatedNodes} from './PaginatedNodes';`
`7`	`7`
`8`	`8`	`interface NodesWrapperProps {`
`9`	`9`	`path?: string;`
	`10`	`+ database?: string;`
`10`	`11`	`parentContainer?: Element \| null;`
`11`	`12`	`additionalNodesProps?: AdditionalNodesProps;`
`12`	`13`	`}`