ydb-embedded-ui 3.4.3 → 3.4.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.4.4](https://github.com/ydb-platform/ydb-embedded-ui/compare/v3.4.3...v3.4.4) (2023-03-22)
+
+
+### Bug Fixes
+
+* **Diagnostics:** display nodes tab for not db entities ([a542dbc](https://github.com/ydb-platform/ydb-embedded-ui/commit/a542dbc23d01138a5c1a4126cfc1836a1543b68c))
+
 ## [3.4.3](https://github.com/ydb-platform/ydb-embedded-ui/compare/v3.4.2...v3.4.3) (2023-03-17)
 
 

package/dist/containers/Nodes/Nodes.tsx

@@ -4,10 +4,11 @@ import {useDispatch} from 'react-redux';
 
 import DataTable from '@gravity-ui/react-data-table';
 
+import type {EPathType} from '../../types/api/schema';
+
 import {AccessDenied} from '../../components/Errors/403';
 import {Illustration} from '../../components/Illustration';
 import {Loader} from '../../components/Loader';
-
 import {Search} from '../../components/Search';
 import {ProblemFilter} from '../../components/ProblemFilter';
 import {UptimeFilter} from '../../components/UptimeFIlter';
@@ -35,6 +36,8 @@ import {
 import {changeFilter, getSettingValue} from '../../store/reducers/settings';
 import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
 
+import {isDatabaseEntityType} from '../Tenant/utils/schema';
+
 import {getNodesColumns} from './getNodesColumns';
 
 import './Nodes.scss';
@@ -48,22 +51,23 @@ interface IAdditionalNodesInfo extends Record<string, unknown> {
 }
 
 interface NodesProps {
-    tenantPath?: string;
+    path?: string;
+    type?: EPathType;
     className?: string;
     additionalNodesInfo?: IAdditionalNodesInfo;
 }
 
-export const Nodes = ({tenantPath, className, additionalNodesInfo = {}}: NodesProps) => {
+export const Nodes = ({path, type, className, additionalNodesInfo = {}}: NodesProps) => {
     const dispatch = useDispatch();
 
-    const isClusterNodes = !tenantPath;
+    const isClusterNodes = !path;
 
     // Since Nodes component is used in several places,
     // we need to reset filters, searchValue and loading state
     // in nodes reducer when path changes
     useEffect(() => {
         dispatch(resetNodesState());
-    }, [dispatch, tenantPath]);
+    }, [dispatch, path]);
 
     const {wasLoaded, loading, error, nodesUptimeFilter, searchValue, totalNodes} =
         useTypedSelector((state) => state.nodes);
@@ -77,12 +81,14 @@ export const Nodes = ({tenantPath, className, additionalNodesInfo = {}}: NodesPr
     );
 
     const fetchNodes = useCallback(() => {
-        if (tenantPath && !JSON.parse(useNodesEndpoint)) {
-            dispatch(getComputeNodes(tenantPath));
+        // For not DB entities we always use /compute endpoint instead of /nodes
+        // since /nodes can return data only for tenants
+        if (path && (!JSON.parse(useNodesEndpoint) || !isDatabaseEntityType(type))) {
+            dispatch(getComputeNodes(path));
         } else {
-            dispatch(getNodes({tenant: tenantPath}));
+            dispatch(getNodes({tenant: path}));
         }
-    }, [dispatch, tenantPath, useNodesEndpoint]);
+    }, [dispatch, path, type, useNodesEndpoint]);
 
     useAutofetcher(fetchNodes, [fetchNodes], isClusterNodes ? true : autorefresh);
 

package/dist/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -131,7 +131,8 @@ function Diagnostics(props: DiagnosticsProps) {
             case GeneralPagesIds.nodes: {
                 return (
                     <Nodes
-                        tenantPath={tenantNameString}
+                        path={currentSchemaPath}
+                        type={type}
                         additionalNodesInfo={props.additionalNodesInfo}
                     />
                 );

package/dist/containers/Tenant/Diagnostics/DiagnosticsPages.ts

@@ -89,12 +89,12 @@ export const DATABASE_PAGES = [
     describe,
 ];
 
-export const TABLE_PAGES = [overview, topShards, graph, tablets, hotKeys, describe];
+export const TABLE_PAGES = [overview, topShards, nodes, graph, tablets, hotKeys, describe];
 
-export const DIR_PAGES = [overview, topShards, describe];
+export const DIR_PAGES = [overview, topShards, nodes, describe];
 
-export const CDC_STREAM_PAGES = [overview, consumers, partitions, describe];
-export const TOPIC_PAGES = [overview, consumers, partitions, describe];
+export const CDC_STREAM_PAGES = [overview, consumers, partitions, nodes, describe];
+export const TOPIC_PAGES = [overview, consumers, partitions, nodes, describe];
 
 // verbose mapping to guarantee correct tabs for new path types
 // TS will error when a new type is added but not mapped here

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "files": [
     "dist"
   ],