fix: pass database param to all handlers inside DB (#1066)

Author: ValeraS

src/containers/Heatmap/Heatmap.tsx

@@ -21,18 +21,19 @@ const b = cn('heatmap');
 const COLORS_RANGE = getColorRange(COLORS_RANGE_SIZE);
 
 interface HeatmapProps {
+    database: string;
     path: string;
 }
 
-export const Heatmap = ({path}: HeatmapProps) => {
+export const Heatmap = ({path, database}: HeatmapProps) => {
     const dispatch = useTypedDispatch();
 
     const itemsContainer = React.createRef<HTMLDivElement>();
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const {currentData, isFetching, error} = heatmapApi.useGetHeatmapTabletsInfoQuery(
-        {path},
+        {path, database},
         {pollingInterval: autoRefreshInterval},
     );
 

src/containers/Tenant/Acl/Acl.tsx

@@ -127,8 +127,8 @@ function getOwnerItem(owner?: string): DefinitionListItem[] {
     ];
 }
 
-export const Acl = ({path}: {path: string}) => {
-    const {currentData, isFetching, error} = schemaAclApi.useGetSchemaAclQuery({path});
+export const Acl = ({path, database}: {path: string; database: string}) => {
+    const {currentData, isFetching, error} = schemaAclApi.useGetSchemaAclQuery({path, database});
 
     const loading = isFetching && !currentData;
 

src/containers/Tenant/Diagnostics/Describe/Describe.tsx

@@ -20,28 +20,32 @@ const expandMap = new Map();
 
 interface IDescribeProps {
     path: string;
+    database: string;
     type?: EPathType;
 }
 
-const Describe = ({path, type}: IDescribeProps) => {
+const Describe = ({path, database, type}: IDescribeProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const isEntityWithMergedImpl = isEntityWithMergedImplementation(type);
 
     const mergedChildrenPaths = useTypedSelector(
-        (state) => selectSchemaMergedChildrenPaths(state, path, type),
+        (state) => selectSchemaMergedChildrenPaths(state, path, type, database),
         shallowEqual,
     );
 
-    let paths: string[] | typeof skipToken = skipToken;
+    let paths: string[] = [];
     if (!isEntityWithMergedImpl) {
         paths = [path];
     } else if (mergedChildrenPaths) {
         paths = [path, ...mergedChildrenPaths];
     }
-    const {currentData, isFetching, error} = describeApi.useGetDescribeQuery(paths, {
-        pollingInterval: autoRefreshInterval,
-    });
+    const {currentData, isFetching, error} = describeApi.useGetDescribeQuery(
+        paths.length ? {paths, database} : skipToken,
+        {
+            pollingInterval: autoRefreshInterval,
+        },
+    );
     const loading = isFetching && currentData === undefined;
     const currentDescribe = currentData;
 

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

@@ -36,7 +36,11 @@ function DetailedOverview(props: DetailedOverviewProps) {
 
     return (
         <div className={b()}>
-            {isTenant ? renderTenantOverview() : <Overview type={type} path={path} />}
+            {isTenant ? (
+                renderTenantOverview()
+            ) : (
+                <Overview type={type} path={path} database={tenantName} />
+            )}
         </div>
     );
 }

src/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -116,13 +116,13 @@ function Diagnostics(props: DiagnosticsProps) {
                 return <Network tenantName={tenantName} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.describe: {
-                return <Describe path={path} type={type} />;
+                return <Describe path={path} database={tenantName} type={type} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.hotKeys: {
-                return <HotKeys path={path} />;
+                return <HotKeys path={path} database={tenantName} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.graph: {
-                return <Heatmap path={path} />;
+                return <Heatmap path={path} database={tenantName} />;
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.consumers: {
                 return <Consumers path={path} type={type} />;

src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx

@@ -54,14 +54,15 @@ const getHotKeysColumns = (keyColumnsIds: string[] = []): Column<HotKey>[] => {
 };
 
 interface HotKeysProps {
+    database: string;
     path: string;
 }
 
-export function HotKeys({path}: HotKeysProps) {
-    const {currentData: data, isFetching, error} = hotKeysApi.useGetHotKeysQuery({path});
+export function HotKeys({path, database}: HotKeysProps) {
+    const {currentData: data, isFetching, error} = hotKeysApi.useGetHotKeysQuery({path, database});
     const loading = isFetching && data === undefined;
 
-    const {data: schemaData, isLoading: schemaLoading} = useGetSchemaQuery({path});
+    const {data: schemaData, isLoading: schemaLoading} = useGetSchemaQuery({path, database});
 
     const keyColumnsIds = schemaData?.PathDescription?.Table?.KeyColumnNames;
 

src/containers/Tenant/Diagnostics/Overview/Overview.tsx

@@ -26,20 +26,21 @@ import {TopicInfo} from './TopicInfo';
 interface OverviewProps {
     type?: EPathType;
     path: string;
+    database: string;
 }
 
-function Overview({type, path}: OverviewProps) {
+function Overview({type, path, database}: OverviewProps) {
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const isEntityWithMergedImpl = isEntityWithMergedImplementation(type);
 
     // shallowEqual prevents rerenders when new schema data is loaded
     const mergedChildrenPaths = useTypedSelector(
-        (state) => selectSchemaMergedChildrenPaths(state, path, type),
+        (state) => selectSchemaMergedChildrenPaths(state, path, type, database),
         shallowEqual,
     );
 
-    let paths: string[] | typeof skipToken = skipToken;
+    let paths: string[] = [];
     if (!isEntityWithMergedImpl) {
         paths = [path];
     } else if (mergedChildrenPaths) {
@@ -50,13 +51,13 @@ function Overview({type, path}: OverviewProps) {
         currentData,
         isFetching,
         error: overviewError,
-    } = overviewApi.useGetOverviewQuery(paths, {
+    } = overviewApi.useGetOverviewQuery(paths.length ? {paths, database} : skipToken, {
         pollingInterval: autoRefreshInterval,
     });
     const overviewLoading = isFetching && currentData === undefined;
     const {data: rawData, additionalData} = currentData || {};
 
-    const {error: schemaError} = useGetSchemaQuery({path});
+    const {error: schemaError} = useGetSchemaQuery({path, database});
 
     const entityLoading = overviewLoading;
     const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;

src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx

@@ -46,7 +46,7 @@ export function TenantOverview({
     const tenantType = mapDatabaseTypeToDBName(Type);
 
     // FIXME: remove after correct data is added to tenantInfo
-    const {data: tenantSchemaData} = useGetSchemaQuery({path: tenantName});
+    const {data: tenantSchemaData} = useGetSchemaQuery({path: tenantName, database: tenantName});
     const {Tables, Topics} =
         tenantSchemaData?.PathDescription?.DomainDescription?.DiskSpaceUsage || {};
 

src/containers/Tenant/ObjectSummary/ObjectSummary.tsx

@@ -92,7 +92,7 @@ export function ObjectSummary({
         ignoreQueryPrefix: true,
     });
 
-    const {data: currentObjectData} = useGetSchemaQuery({path});
+    const {data: currentObjectData} = useGetSchemaQuery({path, database: tenantName});
     const currentSchemaData = currentObjectData?.PathDescription?.Self;
 
     React.useEffect(() => {
@@ -282,7 +282,7 @@ export function ObjectSummary({
     const renderTabContent = () => {
         switch (summaryTab) {
             case TENANT_SUMMARY_TABS_IDS.acl: {
-                return <Acl path={path} />;
+                return <Acl path={path} database={tenantName} />;
             }
             case TENANT_SUMMARY_TABS_IDS.schema: {
                 return <SchemaViewer type={type} path={path} tenantName={tenantName} />;
@@ -403,6 +403,7 @@ export function ObjectSummary({
 function ObjectTree({tenantName, path}: {tenantName: string; path?: string}) {
     const {data: tenantData = {}, isLoading} = useGetSchemaQuery({
         path: tenantName,
+        database: tenantName,
     });
     const pathData = tenantData?.PathDescription?.Self;
 

src/containers/Tenant/Schema/CreateDirectoryDialog/CreateDirectoryDialog.tsx

@@ -13,9 +13,10 @@ const b = cn('ydb-schema-create-directory-dialog');
 
 const relativePathInputId = 'relativePath';
 
-interface SchemaTreeProps {
+interface CreateDirectoryDialogProps {
     open: boolean;
     onClose: VoidFunction;
+    database: string;
     parentPath: string;
     onSuccess: (value: string) => void;
 }
@@ -30,7 +31,13 @@ function validateRelativePath(value: string) {
     return '';
 }
 
-export function CreateDirectoryDialog({open, onClose, parentPath, onSuccess}: SchemaTreeProps) {
+export function CreateDirectoryDialog({
+    open,
+    onClose,
+    database,
+    parentPath,
+    onSuccess,
+}: CreateDirectoryDialogProps) {
     const [validationError, setValidationError] = React.useState('');
     const [relativePath, setRelativePath] = React.useState('');
     const [create, response] = schemaApi.useCreateDirectoryMutation();
@@ -54,7 +61,7 @@ export function CreateDirectoryDialog({open, onClose, parentPath, onSuccess}: Sc
     const handleSubmit = () => {
         const path = `${parentPath}/${relativePath}`;
         create({
-            database: parentPath,
+            database,
             path,
         })
             .unwrap()