fix: review

Author: Raubzeug

package-lock.json

@@ -59,7 +59,7 @@
     "use-query-params": "^2.2.1",
     "uuid": "^10.0.0",
     "web-vitals": "^1.1.2",
-    "ydb-ui-components": "^4.6.0",
+    "ydb-ui-components": "^4.7.0",
     "zod": "^3.24.1"
   },
   "scripts": {

package.json

@@ -24,6 +24,7 @@ import {
     nodeTableTypeToPathType,
 } from '../../utils/schema';
 import {getActions} from '../../utils/schemaActions';
+import type {DropdownItem, TreeNodeMeta} from '../../utils/types';
 import {CreateDirectoryDialog} from '../CreateDirectoryDialog/CreateDirectoryDialog';
 import {useDispatchTreeKey, useTreeKey} from '../UpdateTreeContext';
 import {isDomain} from '../transformPath';
@@ -96,6 +97,7 @@ export function SchemaTree(props: SchemaTreeProps) {
                 // FIXME: should only be explicitly set to true for tables with indexes
                 // at the moment of writing there is no property to determine this, fix later
                 expandable: !isChildless,
+                meta: {subType: PathSubType},
             };
         });
 
@@ -158,7 +160,7 @@ export function SchemaTree(props: SchemaTreeProps) {
                 parentPath={parentPath}
                 onSuccess={handleSuccessSubmit}
             />
-            <NavigationTree
+            <NavigationTree<DropdownItem, TreeNodeMeta>
                 key={schemaTreeKey}
                 rootState={{
                     path: rootPath,

src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx

@@ -28,7 +28,7 @@
         gap: var(--g-spacing-1);
     }
     &__message-container {
-        padding: 15px 20px;
+        padding: var(--g-spacing-3) 0;
     }
 
     &__result {

src/containers/Tenant/Query/Preview/Preview.scss

@@ -60,26 +60,23 @@ export function Preview({
     };
 
     const renderContent = () => {
-        let message;
-
         if (error) {
-            message = (
+            return (
                 <div className={b('message-container', 'error')}>
                     {parseQueryErrorToString(error)}
                 </div>
             );
         }
-        if (message) {
-            return message;
-        }
-        return <div className={b('result')}>{renderResult?.()}</div>;
+        return renderResult?.();
     };
 
     return (
         <LoaderWrapper loading={loading}>
             <div className={b()}>
                 {renderHeader()}
-                <Fullscreen>{renderContent()}</Fullscreen>
+                <Fullscreen>
+                    <div className={b('result')}>{renderContent()}</div>
+                </Fullscreen>
             </div>
         </LoaderWrapper>
     );

src/containers/Tenant/Query/Preview/components/PreviewView.tsx

@@ -1,13 +1,15 @@
 import type {ButtonSize} from '@gravity-ui/uikit';
 import {Button, Icon} from '@gravity-ui/uikit';
-import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-components';
+import type {NavigationTreeNodeType} from 'ydb-ui-components';
 
 import {api} from '../../../store/reducers/api';
 import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {TENANT_PAGES_IDS, TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants';
 import {setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
 import i18n from '../i18n';
 
+import type {YdbNavigationTreeProps} from './types';
+
 import EyeIcon from '@gravity-ui/icons/svgs/eye.svg';
 
 interface ControlsAdditionalEffects {
@@ -32,7 +34,7 @@ const bindActions = (
     };
 };
 
-type Controls = ReturnType<Required<NavigationTreeProps>['renderAdditionalNodeElements']>;
+type Controls = ReturnType<Required<YdbNavigationTreeProps>['renderAdditionalNodeElements']>;
 
 type SummaryType = 'preview';
 
@@ -55,8 +57,8 @@ export const getSchemaControls =
         additionalEffects: ControlsAdditionalEffects,
         size?: ButtonSize,
         isTopicPreviewAvailable?: boolean,
-    ) =>
-    (path: string, type: NavigationTreeNodeType) => {
+    ): YdbNavigationTreeProps['renderAdditionalNodeElements'] =>
+    (path, type, meta) => {
         const options = bindActions(path, dispatch, additionalEffects);
         const openPreview = getPreviewControl(options, size);
 
@@ -72,7 +74,7 @@ export const getSchemaControls =
             column_table: openPreview,
 
             index_table: undefined,
-            topic: isTopicPreviewAvailable ? openPreview : undefined,
+            topic: isTopicPreviewAvailable && !meta?.subType ? openPreview : undefined,
             stream: undefined,
 
             index: undefined,

src/containers/Tenant/utils/controls.tsx

@@ -1,7 +1,7 @@
 import {Copy, PlugConnection} from '@gravity-ui/icons';
 import {Flex, Spin} from '@gravity-ui/uikit';
 import copy from 'copy-to-clipboard';
-import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-components';
+import type {NavigationTreeNodeType} from 'ydb-ui-components';
 
 import type {SnippetParams} from '../../../components/ConnectToDB/types';
 import type {AppDispatch} from '../../../store';
@@ -39,6 +39,7 @@ import {
     selectQueryTemplate,
     upsertQueryTemplate,
 } from './schemaQueryTemplates';
+import type {YdbNavigationTreeProps} from './types';
 
 interface ActionsAdditionalParams {
     setActivePath: (path: string) => void;
@@ -139,7 +140,7 @@ const bindActions = (
     };
 };
 
-type ActionsSet = ReturnType<Required<NavigationTreeProps>['getActions']>;
+type ActionsSet = ReturnType<Required<YdbNavigationTreeProps>['getActions']>;
 
 interface ActionConfig {
     text: string;

src/containers/Tenant/utils/schemaActions.tsx

@@ -0,0 +1,13 @@
+import type {NavigationTreeProps} from 'ydb-ui-components';
+
+export type DropdownItem = {
+    text: string;
+    action: () => void;
+    iconEnd?: React.ReactNode;
+};
+
+export type TreeNodeMeta = {
+    subType?: string;
+};
+
+export type YdbNavigationTreeProps = NavigationTreeProps<DropdownItem, TreeNodeMeta | undefined>;