ydb-embedded-ui 18.5.0 → 19.0.0

package/dist/containers/Tenant/Query/hooks/useExternalQuerySingleTabProtection.js

@@ -0,0 +1,246 @@
+import React from 'react';
+import { parseQuery } from '../../../../routes';
+import { cancelQueryApi } from '../../../../store/reducers/cancelQuery';
+import { selectActiveTabId, selectIsDirty, selectResult, selectUserInput, } from '../../../../store/reducers/query/query';
+import { TENANT_PAGE } from '../../../../store/reducers/tenant/constants';
+import { tenantPageSchema } from '../../../../store/reducers/tenant/types';
+import createToast from '../../../../utils/createToast';
+import { useTypedSelector } from '../../../../utils/hooks';
+import { getRunningQueryConfirmation } from '../../../../utils/hooks/withConfirmation/RunningQueryDialog';
+import { changeInputWithConfirmation } from '../../../../utils/hooks/withConfirmation/useChangeInputWithConfirmation';
+import { queryExecutionManagerInstance } from '../QueryEditor/utils/queryExecutionManager';
+import i18n from '../i18n';
+const STOP_QUERY_ERROR_AUTO_HIDE_TIMEOUT = 5000;
+const externalQueryRequestCoordinators = new WeakMap();
+function getExternalQueryRequestCoordinator(history) {
+    let coordinator = externalQueryRequestCoordinators.get(history);
+    if (!coordinator) {
+        coordinator = { requestEpoch: 0 };
+        externalQueryRequestCoordinators.set(history, coordinator);
+    }
+    return coordinator;
+}
+export function getDatabaseFromQueryParams(queryParams) {
+    const databaseParam = queryParams.database || queryParams.name;
+    return typeof databaseParam === 'string' && databaseParam.trim() ? databaseParam : undefined;
+}
+function isSameExecution(currentExecution, expectedExecution) {
+    return ((currentExecution === null || currentExecution === void 0 ? void 0 : currentExecution.activeTabId) === expectedExecution.activeTabId &&
+        currentExecution.startTime === expectedExecution.startTime);
+}
+function isEquivalentQueryNormalization(previousLocation, nextLocation) {
+    if (previousLocation.pathname !== nextLocation.pathname ||
+        previousLocation.hash !== nextLocation.hash) {
+        return false;
+    }
+    const previousParams = new URLSearchParams(previousLocation.search);
+    const nextParams = new URLSearchParams(nextLocation.search);
+    const legacyDatabase = previousParams.get('name');
+    let normalizesDatabase = false;
+    if (legacyDatabase && !previousParams.has('database')) {
+        normalizesDatabase = true;
+        previousParams.delete('name');
+        previousParams.set('database', legacyDatabase);
+    }
+    const legacyTenantPage = previousParams.get('tenantPage');
+    const normalizesTenantPage = legacyTenantPage !== null;
+    if (normalizesTenantPage) {
+        previousParams.delete('tenantPage');
+        if (!previousParams.has('databasePage')) {
+            previousParams.set('databasePage', legacyTenantPage);
+        }
+    }
+    const previousTenantPage = tenantPageSchema.safeParse(previousParams.get(TENANT_PAGE));
+    const nextTenantPage = tenantPageSchema.safeParse(nextParams.get(TENANT_PAGE));
+    const normalizesFallbackTenantPage = !previousTenantPage.success && nextTenantPage.success;
+    if (normalizesFallbackTenantPage) {
+        previousParams.set(TENANT_PAGE, nextTenantPage.data);
+    }
+    if (!normalizesDatabase && !normalizesTenantPage && !normalizesFallbackTenantPage) {
+        return false;
+    }
+    previousParams.sort();
+    nextParams.sort();
+    return previousParams.toString() === nextParams.toString();
+}
+export function useExternalQueryRequestRegistration(history) {
+    const requestCoordinator = React.useMemo(() => getExternalQueryRequestCoordinator(history), [history]);
+    const latestLocation = React.useRef(history.location);
+    React.useEffect(() => {
+        return history.listen((nextLocation, action) => {
+            const previousLocation = latestLocation.current;
+            latestLocation.current = nextLocation;
+            if (action !== 'REPLACE' ||
+                !isEquivalentQueryNormalization(previousLocation, nextLocation)) {
+                requestCoordinator.requestEpoch += 1;
+            }
+        });
+    }, [history, requestCoordinator]);
+    return React.useCallback(() => {
+        requestCoordinator.requestEpoch += 1;
+    }, [requestCoordinator]);
+}
+export function useExternalQuerySingleTabProtection({ database, history, isMultiTabEnabled, openExternalQueryInEditor, }) {
+    const [sendCancelQuery] = cancelQueryApi.useCancelQueryMutation();
+    const activeTabId = useTypedSelector(selectActiveTabId);
+    const currentInput = useTypedSelector(selectUserInput);
+    const isCurrentTabDirty = useTypedSelector(selectIsDirty);
+    const result = useTypedSelector(selectResult);
+    const requestCoordinator = React.useMemo(() => getExternalQueryRequestCoordinator(history), [history]);
+    const latestOptions = React.useRef({ isMultiTabEnabled, openExternalQueryInEditor });
+    latestOptions.current = { isMultiTabEnabled, openExternalQueryInEditor };
+    const latestEditorState = React.useRef({
+        activeTabId,
+        input: currentInput,
+        isDirty: isCurrentTabDirty,
+        result,
+    });
+    latestEditorState.current = {
+        activeTabId,
+        input: currentInput,
+        isDirty: isCurrentTabDirty,
+        result,
+    };
+    const getCurrentExecutionIdentity = React.useCallback(() => {
+        var _a;
+        const currentEditorState = latestEditorState.current;
+        if (!currentEditorState.activeTabId || ((_a = currentEditorState.result) === null || _a === void 0 ? void 0 : _a.startTime) === undefined) {
+            return undefined;
+        }
+        return {
+            activeTabId: currentEditorState.activeTabId,
+            startTime: currentEditorState.result.startTime,
+        };
+    }, []);
+    const getCurrentRunningExecutionIdentity = React.useCallback(() => {
+        var _a;
+        return ((_a = latestEditorState.current.result) === null || _a === void 0 ? void 0 : _a.isLoading)
+            ? getCurrentExecutionIdentity()
+            : undefined;
+    }, [getCurrentExecutionIdentity]);
+    const isDestinationCurrent = React.useCallback((destination) => {
+        const currentQueryParams = parseQuery(history.location);
+        return (getDatabaseFromQueryParams(currentQueryParams) === destination.database &&
+            requestCoordinator.requestEpoch === destination.requestEpoch);
+    }, [history, requestCoordinator]);
+    const isRequestContextCurrent = React.useCallback(({ destination, confirmedExecution }) => {
+        if (!isDestinationCurrent(destination)) {
+            return false;
+        }
+        if (!confirmedExecution) {
+            return true;
+        }
+        return isSameExecution(getCurrentExecutionIdentity(), confirmedExecution);
+    }, [getCurrentExecutionIdentity, isDestinationCurrent]);
+    const latestOpenExternalQueryInEditorWithConfirmation = React.useRef(() => undefined);
+    const stopRunningQueryAndOpen = React.useCallback(async (request) => {
+        const { query } = request;
+        if (!isRequestContextCurrent(request)) {
+            return;
+        }
+        const runningExecution = latestOptions.current.isMultiTabEnabled
+            ? undefined
+            : getCurrentRunningExecutionIdentity();
+        if (runningExecution && !request.confirmedExecution) {
+            const confirmed = await getRunningQueryConfirmation();
+            const confirmedRequest = {
+                ...request,
+                confirmedExecution: runningExecution,
+            };
+            if (!confirmed || !isRequestContextCurrent(confirmedRequest)) {
+                return;
+            }
+            latestOpenExternalQueryInEditorWithConfirmation.current(confirmedRequest);
+            return;
+        }
+        if (runningExecution) {
+            const editorStateBeforeStop = latestEditorState.current;
+            const runningResult = editorStateBeforeStop.result;
+            if (runningResult === null || runningResult === void 0 ? void 0 : runningResult.streamingStatus) {
+                queryExecutionManagerInstance.abortQuery(runningExecution.activeTabId);
+            }
+            else {
+                const executionDatabase = queryExecutionManagerInstance.getQueryDatabase(runningExecution.activeTabId);
+                if (!executionDatabase || !(runningResult === null || runningResult === void 0 ? void 0 : runningResult.queryId)) {
+                    return;
+                }
+                try {
+                    await sendCancelQuery({
+                        queryId: runningResult.queryId,
+                        database: executionDatabase,
+                    }).unwrap();
+                }
+                catch (_a) {
+                    const currentRunningExecution = getCurrentRunningExecutionIdentity();
+                    if (isSameExecution(currentRunningExecution, runningExecution)) {
+                        createToast({
+                            name: 'stop-error',
+                            title: '',
+                            content: i18n('toaster.stop-error'),
+                            theme: 'danger',
+                            autoHiding: STOP_QUERY_ERROR_AUTO_HIDE_TIMEOUT,
+                        });
+                        return;
+                    }
+                }
+                const currentEditorState = latestEditorState.current;
+                if (!isSameExecution(getCurrentExecutionIdentity(), runningExecution)) {
+                    return;
+                }
+                queryExecutionManagerInstance.abortQuery(runningExecution.activeTabId);
+                if (currentEditorState.input !== editorStateBeforeStop.input ||
+                    currentEditorState.isDirty !== editorStateBeforeStop.isDirty) {
+                    return;
+                }
+            }
+        }
+        if (!isRequestContextCurrent(request)) {
+            return;
+        }
+        latestOptions.current.openExternalQueryInEditor(query);
+    }, [
+        getCurrentExecutionIdentity,
+        getCurrentRunningExecutionIdentity,
+        isRequestContextCurrent,
+        sendCancelQuery,
+    ]);
+    const latestStopRunningQueryAndOpen = React.useRef(stopRunningQueryAndOpen);
+    latestStopRunningQueryAndOpen.current = stopRunningQueryAndOpen;
+    const stopLatestRunningQueryAndOpen = React.useCallback((request) => {
+        latestStopRunningQueryAndOpen.current(request);
+    }, []);
+    const stopLatestRunningQueryAndOpenWithConfirmation = React.useMemo(() => changeInputWithConfirmation(stopLatestRunningQueryAndOpen), [stopLatestRunningQueryAndOpen]);
+    latestOpenExternalQueryInEditorWithConfirmation.current =
+        isMultiTabEnabled || !isCurrentTabDirty
+            ? stopLatestRunningQueryAndOpen
+            : stopLatestRunningQueryAndOpenWithConfirmation;
+    return React.useCallback((query) => {
+        var _a;
+        const currentIsQueryRunning = Boolean((_a = latestEditorState.current.result) === null || _a === void 0 ? void 0 : _a.isLoading);
+        const currentIsMultiTabEnabled = latestOptions.current.isMultiTabEnabled;
+        const confirmedExecution = !currentIsMultiTabEnabled && currentIsQueryRunning
+            ? getCurrentRunningExecutionIdentity()
+            : undefined;
+        if (!currentIsMultiTabEnabled && currentIsQueryRunning && !confirmedExecution) {
+            return;
+        }
+        const request = {
+            query,
+            destination: {
+                database,
+                requestEpoch: requestCoordinator.requestEpoch,
+            },
+            confirmedExecution,
+        };
+        if (!currentIsMultiTabEnabled && currentIsQueryRunning) {
+            getRunningQueryConfirmation().then((confirmed) => {
+                if (confirmed) {
+                    latestOpenExternalQueryInEditorWithConfirmation.current(request);
+                }
+            });
+            return;
+        }
+        latestOpenExternalQueryInEditorWithConfirmation.current(request);
+    }, [database, getCurrentRunningExecutionIdentity, requestCoordinator]);
+}
+//# sourceMappingURL=useExternalQuerySingleTabProtection.js.map

package/dist/containers/Tenant/Query/hooks/useExternalQuerySingleTabProtection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useExternalQuerySingleTabProtection.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/hooks/useExternalQuerySingleTabProtection.ts"],"names":[],"mappings":"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"}

package/dist/containers/Tenant/Query/hooks/useOpenExternalQueryInEditor.d.ts

@@ -4,4 +4,4 @@ export interface ExternalQueryToOpen {
     savedQueryName?: string;
     onAfterOpen?: () => void;
 }
-export declare function useOpenExternalQueryInEditor(): ({ title, input, savedQueryName, onAfterOpen }: ExternalQueryToOpen) => void;
+export declare function useOpenExternalQueryInEditor(): (query: ExternalQueryToOpen) => void;

package/dist/containers/Tenant/Query/hooks/useOpenExternalQueryInEditor.js

@@ -1,14 +1,31 @@
 import React from 'react';
+import { useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 import { v4 as uuidv4 } from 'uuid';
+import routes, { createHref, getLocationObjectFromHref, parseQuery } from '../../../../routes';
+import { environment as configuredEnvironment } from '../../../../store';
 import { useMultiTabQueryEditorEnabled } from '../../../../store/reducers/capabilities/hooks';
 import { applyExternalQueryToActiveTab, setIsDirty, setQueryTabContent, } from '../../../../store/reducers/query/query';
-import { TENANT_QUERY_TABS_ID } from '../../../../store/reducers/tenant/constants';
+import { TENANT_PAGE, TENANT_PAGES_IDS, TENANT_QUERY_TABS_ID, } from '../../../../store/reducers/tenant/constants';
 import { setQueryTab } from '../../../../store/reducers/tenant/tenant';
 import { useTypedDispatch } from '../../../../utils/hooks';
+import { TenantTabsGroups } from '../../TenantPages';
+import { getDatabaseFromQueryParams, useExternalQueryRequestRegistration, useExternalQuerySingleTabProtection, } from './useExternalQuerySingleTabProtection';
+const ROUTE_PATHS = Object.values(routes);
 export function useOpenExternalQueryInEditor() {
+    var _a;
     const dispatch = useTypedDispatch();
+    const history = useHistory();
+    const location = useLocation();
+    const currentRouteMatch = useRouteMatch({
+        path: ROUTE_PATHS,
+        exact: true,
+    });
+    const routeEnvironment = (_a = currentRouteMatch === null || currentRouteMatch === void 0 ? void 0 : currentRouteMatch.params.environment) !== null && _a !== void 0 ? _a : configuredEnvironment;
     const isMultiTabEnabled = useMultiTabQueryEditorEnabled();
-    return React.useCallback(({ title, input, savedQueryName, onAfterOpen }) => {
+    const queryParams = React.useMemo(() => parseQuery(location), [location]);
+    const database = getDatabaseFromQueryParams(queryParams);
+    const registerExternalQueryRequest = useExternalQueryRequestRegistration(history);
+    const openExternalQueryInEditor = React.useCallback(({ title, input, savedQueryName, onAfterOpen }) => {
         if (isMultiTabEnabled) {
             dispatch(setQueryTabContent({
                 tabId: uuidv4(),
@@ -26,7 +43,44 @@ export function useOpenExternalQueryInEditor() {
         }
         dispatch(setIsDirty(false));
         dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
+        const queryPath = createHref(routes.tenant, { environment: routeEnvironment }, {
+            ...queryParams,
+            database,
+            name: undefined,
+            [TENANT_PAGE]: TENANT_PAGES_IDS.query,
+            [TenantTabsGroups.queryTab]: TENANT_QUERY_TABS_ID.newQuery,
+        });
+        const queryPathname = getLocationObjectFromHref(queryPath).pathname;
+        const isQueryEditorLocation = history.location.pathname === queryPathname &&
+            queryParams[TENANT_PAGE] === TENANT_PAGES_IDS.query;
+        if (!isQueryEditorLocation) {
+            history.push(queryPath);
+        }
         onAfterOpen === null || onAfterOpen === void 0 ? void 0 : onAfterOpen();
-    }, [dispatch, isMultiTabEnabled]);
+    }, [database, dispatch, history, isMultiTabEnabled, queryParams, routeEnvironment]);
+    const openExternalQueryWithSingleTabProtection = useExternalQuerySingleTabProtection({
+        database: database !== null && database !== void 0 ? database : '',
+        history,
+        isMultiTabEnabled,
+        openExternalQueryInEditor,
+    });
+    return React.useCallback((query) => {
+        if (!database) {
+            return;
+        }
+        registerExternalQueryRequest();
+        if (isMultiTabEnabled) {
+            openExternalQueryInEditor(query);
+        }
+        else {
+            openExternalQueryWithSingleTabProtection(query);
+        }
+    }, [
+        database,
+        isMultiTabEnabled,
+        openExternalQueryInEditor,
+        openExternalQueryWithSingleTabProtection,
+        registerExternalQueryRequest,
+    ]);
 }
 //# sourceMappingURL=useOpenExternalQueryInEditor.js.map

package/dist/containers/Tenant/Query/hooks/useOpenExternalQueryInEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOpenExternalQueryInEditor.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/hooks/useOpenExternalQueryInEditor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,EAAE,IAAI,MAAM,EAAC,MAAM,MAAM,CAAC;AAElC,OAAO,EAAC,6BAA6B,EAAC,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EACH,6BAA6B,EAC7B,UAAU,EACV,kBAAkB,GACrB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AASzD,MAAM,UAAU,4BAA4B;IACxC,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IACpC,MAAM,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;IAE1D,OAAO,KAAK,CAAC,WAAW,CACpB,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAsB,EAAE,EAAE;QACjE,IAAI,iBAAiB,EAAE,CAAC;YACpB,QAAQ,CACJ,kBAAkB,CAAC;gBACf,KAAK,EAAE,MAAM,EAAE;gBACf,KAAK;gBACL,KAAK;gBACL,cAAc;aACjB,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,QAAQ,CACJ,6BAA6B,CAAC;gBAC1B,KAAK;gBACL,KAAK;gBACL,cAAc;aACjB,CAAC,CACL,CAAC;QACN,CAAC;QAED,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5B,QAAQ,CAAC,WAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrD,WAAW,aAAX,WAAW,uBAAX,WAAW,EAAI,CAAC;IACpB,CAAC,EACD,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAChC,CAAC;AACN,CAAC"}
+{"version":3,"file":"useOpenExternalQueryInEditor.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/hooks/useOpenExternalQueryInEditor.ts"],"names":[],"mappings":"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"}

package/dist/containers/Tenant/TenantDrawerHealthcheck.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-interface TenantDrawerWrapperProps {
+interface TenantDrawerHealthcheckProps {
     children: React.ReactNode;
+    clusterName?: string;
 }
-export declare function TenantDrawerHealthcheck({ children }: TenantDrawerWrapperProps): import("react/jsx-runtime").JSX.Element;
+export declare function TenantDrawerHealthcheck({ children, clusterName }: TenantDrawerHealthcheckProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/containers/Tenant/TenantDrawerHealthcheck.js

@@ -7,19 +7,19 @@ import { HealthcheckDrawer } from './Healthcheck/components/HealthcheckDrawer';
 import { useCurrentSchema } from './TenantContext';
 import i18n from './i18n';
 import { useTenantQueryParams } from './useTenantQueryParams';
-export function TenantDrawerHealthcheck({ children }) {
+export function TenantDrawerHealthcheck({ children, clusterName }) {
     const { database } = useCurrentSchema();
     const { handleShowHealthcheckChange, showHealthcheck, handleIssuesFilterChange, handleHealthcheckViewChange, } = useTenantQueryParams();
-    const healthcheckStatus = useTypedSelector((state) => selectCheckStatus(state, database || ''));
-    const healthcheckData = useTypedSelector((state) => selectAllHealthcheckInfo(state, database || ''));
+    const healthcheckStatus = useTypedSelector((state) => selectCheckStatus(state, database || '', clusterName));
+    const healthcheckData = useTypedSelector((state) => selectAllHealthcheckInfo(state, database || '', clusterName));
     const handleCloseDrawer = React.useCallback(() => {
         handleShowHealthcheckChange(false);
         handleIssuesFilterChange(undefined);
         handleHealthcheckViewChange(undefined);
     }, [handleShowHealthcheckChange, handleIssuesFilterChange, handleHealthcheckViewChange]);
     const renderDrawerContent = React.useCallback(() => {
-        return _jsx(Healthcheck, { database: database });
-    }, [database]);
+        return _jsx(Healthcheck, { database: database, clusterName: clusterName });
+    }, [database, clusterName]);
     return (_jsx(HealthcheckDrawer, { isDrawerVisible: Boolean(showHealthcheck), onCloseDrawer: handleCloseDrawer, renderDrawerContent: renderDrawerContent, drawerId: "tenant-healthcheck-details", storageKey: "tenant-healthcheck-details-drawer-width", title: i18n('title_healthcheck-dashboard'), status: healthcheckStatus, healthcheckData: healthcheckData, downloadFilePrefix: `${database}-healthcheck`, downloadTooltip: i18n('action_download-healthcheck'), children: children }));
 }
 //# sourceMappingURL=TenantDrawerHealthcheck.js.map

package/dist/containers/Tenant/TenantDrawerHealthcheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"TenantDrawerHealthcheck.js","sourceRoot":"","sources":["../../../src/containers/Tenant/TenantDrawerHealthcheck.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,wBAAwB,EACxB,iBAAiB,GACpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAM5D,MAAM,UAAU,uBAAuB,CAAC,EAAC,QAAQ,EAA2B;IACxE,MAAM,EAAC,QAAQ,EAAC,GAAG,gBAAgB,EAAE,CAAC;IACtC,MAAM,EACF,2BAA2B,EAC3B,eAAe,EACf,wBAAwB,EACxB,2BAA2B,GAC9B,GAAG,oBAAoB,EAAE,CAAC;IAE3B,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;IAEhG,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/C,wBAAwB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC,CAClD,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC7C,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACnC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,2BAA2B,EAAE,wBAAwB,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAEzF,MAAM,mBAAmB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC/C,OAAO,KAAC,WAAW,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAC;IAC/C,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CACH,KAAC,iBAAiB,IACd,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,EACzC,aAAa,EAAE,iBAAiB,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAC,4BAA4B,EACrC,UAAU,EAAC,yCAAyC,EACpD,KAAK,EAAE,IAAI,CAAC,6BAA6B,CAAC,EAC1C,MAAM,EAAE,iBAAiB,EACzB,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,GAAG,QAAQ,cAAc,EAC7C,eAAe,EAAE,IAAI,CAAC,6BAA6B,CAAC,YAEnD,QAAQ,GACO,CACvB,CAAC;AACN,CAAC"}
+{"version":3,"file":"TenantDrawerHealthcheck.js","sourceRoot":"","sources":["../../../src/containers/Tenant/TenantDrawerHealthcheck.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,wBAAwB,EACxB,iBAAiB,GACpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAO5D,MAAM,UAAU,uBAAuB,CAAC,EAAC,QAAQ,EAAE,WAAW,EAA+B;IACzF,MAAM,EAAC,QAAQ,EAAC,GAAG,gBAAgB,EAAE,CAAC;IACtC,MAAM,EACF,2BAA2B,EAC3B,eAAe,EACf,wBAAwB,EACxB,2BAA2B,GAC9B,GAAG,oBAAoB,EAAE,CAAC;IAE3B,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CACjD,iBAAiB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,EAAE,WAAW,CAAC,CACxD,CAAC;IAEF,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/C,wBAAwB,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,EAAE,WAAW,CAAC,CAC/D,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC7C,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACnC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,2BAA2B,EAAE,wBAAwB,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAEzF,MAAM,mBAAmB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC/C,OAAO,KAAC,WAAW,IAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAI,CAAC;IACzE,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5B,OAAO,CACH,KAAC,iBAAiB,IACd,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,EACzC,aAAa,EAAE,iBAAiB,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAC,4BAA4B,EACrC,UAAU,EAAC,yCAAyC,EACpD,KAAK,EAAE,IAAI,CAAC,6BAA6B,CAAC,EAC1C,MAAM,EAAE,iBAAiB,EACzB,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,GAAG,QAAQ,cAAc,EAC7C,eAAe,EAAE,IAAI,CAAC,6BAA6B,CAAC,YAEnD,QAAQ,GACO,CACvB,CAAC;AACN,CAAC"}

package/dist/containers/Tenant/TenantDrawerWrappers.js

@@ -1,8 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { DrawerContextProvider } from '../../components/Drawer/DrawerContext';
+import { useClusterNameFromQuery } from '../../utils/hooks/useDatabaseFromQuery';
 import { TenantDrawerHealthcheck } from './TenantDrawerHealthcheck';
 import { TenantDrawerRights } from './TenantDrawerRights';
 export function TenantDrawerWrapper({ children }) {
-    return (_jsx(DrawerContextProvider, { children: _jsx(TenantDrawerHealthcheck, { children: _jsx(TenantDrawerRights, { children: children }) }) }));
+    const clusterName = useClusterNameFromQuery();
+    return (_jsx(DrawerContextProvider, { children: _jsx(TenantDrawerHealthcheck, { clusterName: clusterName, children: _jsx(TenantDrawerRights, { children: children }) }) }));
 }
 //# sourceMappingURL=TenantDrawerWrappers.js.map

package/dist/containers/Tenant/TenantDrawerWrappers.js.map

@@ -1 +1 @@
-{"version":3,"file":"TenantDrawerWrappers.js","sourceRoot":"","sources":["../../../src/containers/Tenant/TenantDrawerWrappers.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAE5E,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAMxD,MAAM,UAAU,mBAAmB,CAAC,EAAC,QAAQ,EAA2B;IACpE,OAAO,CACH,KAAC,qBAAqB,cAClB,KAAC,uBAAuB,cACpB,KAAC,kBAAkB,cAAE,QAAQ,GAAsB,GAC7B,GACN,CAC3B,CAAC;AACN,CAAC"}
+{"version":3,"file":"TenantDrawerWrappers.js","sourceRoot":"","sources":["../../../src/containers/Tenant/TenantDrawerWrappers.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAC,uBAAuB,EAAC,MAAM,wCAAwC,CAAC;AAE/E,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAMxD,MAAM,UAAU,mBAAmB,CAAC,EAAC,QAAQ,EAA2B;IACpE,MAAM,WAAW,GAAG,uBAAuB,EAAE,CAAC;IAE9C,OAAO,CACH,KAAC,qBAAqB,cAClB,KAAC,uBAAuB,IAAC,WAAW,EAAE,WAAW,YAC7C,KAAC,kBAAkB,cAAE,QAAQ,GAAsB,GAC7B,GACN,CAC3B,CAAC;AACN,CAAC"}

package/dist/containers/Tenant/utils/diagnosticsNavigation.d.ts

@@ -1,3 +1,3 @@
 import type { TenantDiagnosticsTab, TenantPage } from '../../../store/reducers/tenant/types';
-export declare const V2_DATABASE_PAGE_DIAGNOSTICS_TABS: readonly ["database", "monitoring", "topQueries", "storage", "network", "configs", "operations", "backups"];
-export declare function getTenantPageForDiagnosticsTab(tab: TenantDiagnosticsTab, isV2Enabled: boolean): TenantPage;
+export declare const V2_DATABASE_PAGE_DIAGNOSTICS_TABS: readonly ["database", "monitoring", "topQueries", "nodes", "tablets", "storage", "network", "configs", "operations", "backups"];
+export declare function getTenantPageForDiagnosticsTab(tab: TenantDiagnosticsTab, isV2Enabled: boolean, currentTenantPage?: TenantPage): TenantPage;

package/dist/containers/Tenant/utils/diagnosticsNavigation.js

@@ -3,10 +3,13 @@ import { TENANT_DIAGNOSTICS_TABS_IDS, TENANT_PAGES_IDS, } from '../../../store/r
 // Route each tab to the page that renders it; otherwise Diagnostics falls back to the
 // first available tab and actions like "Monitoring" appear to do nothing.
 // These tabs live under databasePage=database; the rest stay under databasePage=diagnostics.
+// Tabs listed in V2_DUPLICATED_TABS are available on both pages.
 export const V2_DATABASE_PAGE_DIAGNOSTICS_TABS = [
     TENANT_DIAGNOSTICS_TABS_IDS.database,
     TENANT_DIAGNOSTICS_TABS_IDS.monitoring,
     TENANT_DIAGNOSTICS_TABS_IDS.topQueries,
+    TENANT_DIAGNOSTICS_TABS_IDS.nodes,
+    TENANT_DIAGNOSTICS_TABS_IDS.tablets,
     TENANT_DIAGNOSTICS_TABS_IDS.storage,
     TENANT_DIAGNOSTICS_TABS_IDS.network,
     TENANT_DIAGNOSTICS_TABS_IDS.configs,
@@ -14,10 +17,19 @@ export const V2_DATABASE_PAGE_DIAGNOSTICS_TABS = [
     TENANT_DIAGNOSTICS_TABS_IDS.backups,
 ];
 const V2_DATABASE_PAGE_TABS = new Set(V2_DATABASE_PAGE_DIAGNOSTICS_TABS);
-export function getTenantPageForDiagnosticsTab(tab, isV2Enabled) {
+const V2_DUPLICATED_TABS = new Set([
+    TENANT_DIAGNOSTICS_TABS_IDS.nodes,
+    TENANT_DIAGNOSTICS_TABS_IDS.tablets,
+]);
+export function getTenantPageForDiagnosticsTab(tab, isV2Enabled, currentTenantPage) {
     if (!isV2Enabled) {
         return TENANT_PAGES_IDS.diagnostics;
     }
+    if (V2_DUPLICATED_TABS.has(tab)) {
+        return currentTenantPage === TENANT_PAGES_IDS.database
+            ? TENANT_PAGES_IDS.database
+            : TENANT_PAGES_IDS.diagnostics;
+    }
     return V2_DATABASE_PAGE_TABS.has(tab)
         ? TENANT_PAGES_IDS.database
         : TENANT_PAGES_IDS.diagnostics;

package/dist/containers/Tenant/utils/diagnosticsNavigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnosticsNavigation.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/utils/diagnosticsNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,2BAA2B,EAC3B,gBAAgB,GACnB,MAAM,0CAA0C,CAAC;AAGlD,2FAA2F;AAC3F,sFAAsF;AACtF,0EAA0E;AAC1E,6FAA6F;AAC7F,MAAM,CAAC,MAAM,iCAAiC,GAAG;IAC7C,2BAA2B,CAAC,QAAQ;IACpC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,OAAO;CACa,CAAC;AAErD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAuB,iCAAiC,CAAC,CAAC;AAE/F,MAAM,UAAU,8BAA8B,CAC1C,GAAyB,EACzB,WAAoB;IAEpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACxC,CAAC;IACD,OAAO,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,gBAAgB,CAAC,QAAQ;QAC3B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;AACvC,CAAC"}
+{"version":3,"file":"diagnosticsNavigation.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/utils/diagnosticsNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,2BAA2B,EAC3B,gBAAgB,GACnB,MAAM,0CAA0C,CAAC;AAGlD,2FAA2F;AAC3F,sFAAsF;AACtF,0EAA0E;AAC1E,6FAA6F;AAC7F,iEAAiE;AACjE,MAAM,CAAC,MAAM,iCAAiC,GAAG;IAC7C,2BAA2B,CAAC,QAAQ;IACpC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,KAAK;IACjC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,OAAO;IACnC,2BAA2B,CAAC,UAAU;IACtC,2BAA2B,CAAC,OAAO;CACa,CAAC;AAErD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAuB,iCAAiC,CAAC,CAAC;AAC/F,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAuB;IACrD,2BAA2B,CAAC,KAAK;IACjC,2BAA2B,CAAC,OAAO;CACtC,CAAC,CAAC;AAEH,MAAM,UAAU,8BAA8B,CAC1C,GAAyB,EACzB,WAAoB,EACpB,iBAA8B;IAE9B,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACxC,CAAC;IACD,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,iBAAiB,KAAK,gBAAgB,CAAC,QAAQ;YAClD,CAAC,CAAC,gBAAgB,CAAC,QAAQ;YAC3B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;IACvC,CAAC;IACD,OAAO,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;QACjC,CAAC,CAAC,gBAAgB,CAAC,QAAQ;QAC3B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;AACvC,CAAC"}

package/dist/containers/Tenants/DatabaseDrawerHealthcheck.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { PreparedTenant } from '../../store/reducers/tenants/types';
+export type DatabaseStatusClickHandler = (tenant: PreparedTenant, database: string | undefined) => void;
+interface DatabaseDrawerHealthcheckProps {
+    children: (onStatusClick: DatabaseStatusClickHandler) => React.ReactNode;
+    clusterName?: string;
+}
+export declare function DatabaseDrawerHealthcheck({ children, clusterName }: DatabaseDrawerHealthcheckProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/containers/Tenants/DatabaseDrawerHealthcheck.js

@@ -0,0 +1,39 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
+import { selectAllHealthcheckInfo, selectCheckStatus, } from '../../store/reducers/healthcheckInfo/healthcheckInfo';
+import { useTypedSelector } from '../../utils/hooks';
+import { Healthcheck } from '../Tenant/Healthcheck/Healthcheck';
+import { HealthcheckDrawer } from '../Tenant/Healthcheck/components/HealthcheckDrawer';
+import tenantI18n from '../Tenant/i18n';
+import { useTenantQueryParams } from '../Tenant/useTenantQueryParams';
+export function DatabaseDrawerHealthcheck({ children, clusterName }) {
+    var _a, _b;
+    const [selectedDatabase, setSelectedDatabase] = React.useState();
+    const { handleIssuesFilterChange, handleHealthcheckViewChange } = useTenantQueryParams();
+    const selectedTenant = selectedDatabase === null || selectedDatabase === void 0 ? void 0 : selectedDatabase.tenant;
+    const database = (_a = selectedDatabase === null || selectedDatabase === void 0 ? void 0 : selectedDatabase.database) !== null && _a !== void 0 ? _a : '';
+    const databaseName = (_b = selectedTenant === null || selectedTenant === void 0 ? void 0 : selectedTenant.Name) !== null && _b !== void 0 ? _b : '';
+    const selectedClusterName = clusterName !== null && clusterName !== void 0 ? clusterName : selectedTenant === null || selectedTenant === void 0 ? void 0 : selectedTenant.Cluster;
+    const databaseType = selectedTenant === null || selectedTenant === void 0 ? void 0 : selectedTenant.Type;
+    const healthcheckStatus = useTypedSelector((state) => selectCheckStatus(state, database, selectedClusterName));
+    const healthcheckData = useTypedSelector((state) => selectAllHealthcheckInfo(state, database, selectedClusterName));
+    const handleStatusClick = React.useCallback((tenant, selectedDatabaseValue) => {
+        if (selectedDatabaseValue && tenant.Type !== 'Serverless') {
+            setSelectedDatabase({ tenant, database: selectedDatabaseValue });
+        }
+    }, []);
+    const handleCloseDrawer = React.useCallback(() => {
+        setSelectedDatabase(undefined);
+        handleIssuesFilterChange(undefined);
+        handleHealthcheckViewChange(undefined);
+    }, [handleHealthcheckViewChange, handleIssuesFilterChange]);
+    const renderDrawerContent = React.useCallback(() => {
+        if (!database) {
+            return null;
+        }
+        return (_jsx(Healthcheck, { database: database, clusterName: selectedClusterName, databaseType: databaseType }));
+    }, [database, databaseType, selectedClusterName]);
+    const title = `${tenantI18n('title_healthcheck-dashboard')}${databaseName ? `: ${databaseName}` : ''}`;
+    return (_jsx(HealthcheckDrawer, { isDrawerVisible: Boolean(database), onCloseDrawer: handleCloseDrawer, renderDrawerContent: renderDrawerContent, drawerId: "database-list-healthcheck-details", storageKey: "database-list-healthcheck-details-drawer-width", title: title, status: healthcheckStatus, healthcheckData: healthcheckData, downloadFilePrefix: `${databaseName || database}-healthcheck`, downloadTooltip: tenantI18n('action_download-healthcheck'), isDownloadDisabled: !healthcheckData, children: children(handleStatusClick) }));
+}
+//# sourceMappingURL=DatabaseDrawerHealthcheck.js.map

package/dist/containers/Tenants/DatabaseDrawerHealthcheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DatabaseDrawerHealthcheck.js","sourceRoot":"","sources":["../../../src/containers/Tenants/DatabaseDrawerHealthcheck.tsx"],"names":[],"mappings":"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"}

package/dist/containers/Tenants/TenantsTable.d.ts

@@ -11,5 +11,5 @@ interface TenantsTableProps {
     showWithProblemsFilter?: boolean;
     showPoolsColumn?: boolean;
 }
-export declare const TenantsTable: ({ clusterName, environmentName, isMetaDatabasesAvailable, scrollContainerRef, additionalTenantsProps, showDomainDatabase, showWithProblemsFilter, showPoolsColumn, }: TenantsTableProps) => import("react/jsx-runtime").JSX.Element;
+export declare function TenantsTable(props: TenantsTableProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/containers/Tenants/TenantsTable.js

@@ -27,6 +27,7 @@ import { useAutoRefreshInterval, useSetting } from '../../utils/hooks';
 import { useSelectedColumns } from '../../utils/hooks/useSelectedColumns';
 import { getIllustration } from '../../utils/illustrations';
 import { isNumeric } from '../../utils/utils';
+import { DatabaseDrawerHealthcheck } from './DatabaseDrawerHealthcheck';
 import { DATABASES_COLUMNS_IDS, DATABASES_COLUMNS_TITLES, DATABASES_DEFAULT_COLUMNS, DATABASES_REQUIRED_COLUMNS, DATABASES_SELECTED_COLUMNS_KEY, } from './constants';
 import i18n from './i18n';
 import { useTenantsQueryParams } from './useTenantsQueryParams';
@@ -69,7 +70,7 @@ function databaseStateToLabelTheme(state) {
         }
     }
 }
-export const TenantsTable = ({ clusterName, environmentName, isMetaDatabasesAvailable, scrollContainerRef, additionalTenantsProps, showDomainDatabase, showWithProblemsFilter, showPoolsColumn, }) => {
+const TenantsTableContent = ({ clusterName, environmentName, isMetaDatabasesAvailable, scrollContainerRef, additionalTenantsProps, showDomainDatabase, showWithProblemsFilter, showPoolsColumn, onStatusClick, }) => {
     const SuccessImage = getIllustration('SuccessOperation');
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const { currentData, isFetching, error } = tenantsApi.useGetTenantsInfoQuery({ clusterName, environmentName, isMetaDatabasesAvailable }, { pollingInterval: autoRefreshInterval });
@@ -110,7 +111,7 @@ export const TenantsTable = ({ clusterName, environmentName, isMetaDatabasesAvai
             {
                 name: DATABASES_COLUMNS_IDS.Name,
                 header: DATABASES_COLUMNS_TITLES[DATABASES_COLUMNS_IDS.Name],
-                render: ({ row }) => (_jsx(TenantNameWrapper, { tenant: row, clusterName: clusterName, additionalTenantsProps: additionalTenantsProps, externalLink: Boolean(environmentName) })),
+                render: ({ row }) => (_jsx(TenantNameWrapper, { tenant: row, clusterName: clusterName, additionalTenantsProps: additionalTenantsProps, externalLink: Boolean(environmentName), onStatusClick: onStatusClick })),
                 width: 440,
                 resizeMinWidth: 200,
                 sortable: true,
@@ -220,6 +221,7 @@ export const TenantsTable = ({ clusterName, environmentName, isMetaDatabasesAvai
         additionalTenantsProps,
         environmentName,
         handleSearchChange,
+        onStatusClick,
         showNetworkUtilization,
         showPoolsColumn,
     ]);
@@ -238,4 +240,8 @@ export const TenantsTable = ({ clusterName, environmentName, isMetaDatabasesAvai
     };
     return (_jsx("div", { className: b('table-wrapper'), children: _jsxs(TableWithControlsLayout, { fullHeight: true, children: [_jsx(TableWithControlsLayout.Controls, { renderExtraControls: renderExtraControls, children: renderControls() }), error ? _jsx(ResponseError, { error: error }) : null, _jsx(TableWithControlsLayout.Table, { scrollContainerRef: scrollContainerRef, loading: loading, scrollDependencies: [search, withProblems, sortParams], children: currentData ? renderTable() : null })] }) }));
 };
+export function TenantsTable(props) {
+    var _a, _b;
+    return (_jsx(DatabaseDrawerHealthcheck, { clusterName: props.clusterName, children: (onStatusClick) => _jsx(TenantsTableContent, { ...props, onStatusClick: onStatusClick }) }, `${(_a = props.clusterName) !== null && _a !== void 0 ? _a : ''}:${(_b = props.environmentName) !== null && _b !== void 0 ? _b : ''}`));
+}
 //# sourceMappingURL=TenantsTable.js.map